From 56ffc00fb1c98dfdc18dcac44226de1ce6e685e5 Mon Sep 17 00:00:00 2001
From: akashk4 <akashk4@illinois.edu>
Date: Tue, 7 Jan 2020 06:44:57 -0600
Subject: [PATCH] Move HPVM directory out from llvm/tools

---
 {llvm/tools/hpvm => hpvm}/CMakeLists.txt      |   0
 .../hpvm => hpvm}/include/BuildDFG/BuildDFG.h |   0
 .../hpvm => hpvm}/include/GenVISC/GenVISC.h   |   0
 .../include/SupportVISC/DFG2LLVM.h            |   0
 .../include/SupportVISC/DFGTreeTraversal.h    |   0
 .../include/SupportVISC/DFGraph.h             |   0
 .../include/SupportVISC/VISCHint.h            |   0
 .../include/SupportVISC/VISCTimer.h           |   0
 .../include/SupportVISC/VISCUtils.h           |   0
 {llvm/tools/hpvm => hpvm}/lib/CMakeLists.txt  |   0
 .../lib/Transforms/BuildDFG/BuildDFG.cpp      |   0
 .../lib/Transforms/BuildDFG/BuildDFG.exports  |   0
 .../lib/Transforms/BuildDFG/CMakeLists.txt    |   0
 .../lib/Transforms/BuildDFG/LLVMBuild.txt     |   0
 .../lib/Transforms/CMakeLists.txt             |   0
 .../lib/Transforms/ClearDFG/CMakeLists.txt    |   0
 .../lib/Transforms/ClearDFG/ClearDFG.cpp      |   0
 .../lib/Transforms/ClearDFG/ClearDFG.exports  |   0
 .../lib/Transforms/ClearDFG/LLVMBuild.txt     |   0
 .../Transforms/DFG2LLVM_NVPTX/CMakeLists.txt  |   0
 .../DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp         |   0
 .../DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.exports     |   0
 .../Transforms/DFG2LLVM_NVPTX/LLVMBuild.txt   |   0
 .../Transforms/DFG2LLVM_SPIR/CMakeLists.txt   |   0
 .../DFG2LLVM_SPIR/DFG2LLVM_SPIR.cpp           |   0
 .../DFG2LLVM_SPIR/DFG2LLVM_SPIR.exports       |   0
 .../Transforms/DFG2LLVM_SPIR/LLVMBuild.txt    |   0
 .../Transforms/DFG2LLVM_X86/CMakeLists.txt    |   0
 .../Transforms/DFG2LLVM_X86/DFG2LLVM_X86.cpp  |   0
 .../DFG2LLVM_X86/DFG2LLVM_X86.exports         |   0
 .../lib/Transforms/DFG2LLVM_X86/LLVMBuild.txt |   0
 .../lib/Transforms/GenVISC/CMakeLists.txt     |   0
 .../lib/Transforms/GenVISC/GenVISC.cpp        |   0
 .../lib/Transforms/GenVISC/GenVISC.exports    |   0
 .../lib/Transforms/GenVISC/LLVMBuild.txt      |   0
 .../lib/Transforms/LocalMem/CMakeLists.txt    |   0
 .../lib/Transforms/LocalMem/LLVMBuild.txt     |   0
 .../lib/Transforms/LocalMem/LocalMem.cpp      |   0
 .../lib/Transforms/LocalMem/LocalMem.exports  |   0
 .../llvm_installer/llvm_installer.sh          |   0
 .../hpvm => hpvm}/llvm_patches/.#patch_src.sh |   0
 .../hpvm => hpvm}/llvm_patches/apply_patch.sh |   0
 .../llvm_patches/construct_patch.sh           |   0
 .../include/Bitcode/LLVMBitCodes.h            |   0
 .../include/Bitcode/LLVMBitCodes.h.patch      |   0
 .../llvm_patches/include/IR/Attributes.td     |   0
 .../include/IR/Attributes.td.patch            |   0
 .../llvm_patches/include/IR/Intrinsics.td     |   0
 .../include/IR/Intrinsics.td.patch            |   0
 .../llvm_patches/include/IR/IntrinsicsVISC.td |   0
 .../include/IR/IntrinsicsVISC.td.patch        |   0
 .../llvm_patches/include/Support/Debug.h      |   0
 .../include/Support/Debug.h.patch             |   0
 .../llvm_patches/lib/AsmParser/LLLexer.cpp    |   0
 .../lib/AsmParser/LLLexer.cpp.patch           |   0
 .../llvm_patches/lib/AsmParser/LLLexer.h      |   0
 .../lib/AsmParser/LLLexer.h.patch             |   0
 .../llvm_patches/lib/AsmParser/LLParser.cpp   |   0
 .../lib/AsmParser/LLParser.cpp.patch          |   0
 .../llvm_patches/lib/AsmParser/LLParser.h     |   0
 .../lib/AsmParser/LLParser.h.patch            |   0
 .../llvm_patches/lib/AsmParser/LLToken.h      |   0
 .../lib/AsmParser/LLToken.h.patch             |   0
 .../lib/Bitcode/Reader/BitcodeReader.cpp      |   0
 .../Bitcode/Reader/BitcodeReader.cpp.patch    |   0
 .../lib/Bitcode/Writer/BitcodeWriter.cpp      |   0
 .../Bitcode/Writer/BitcodeWriter.cpp.patch    |   0
 .../llvm_patches/lib/IR/Attributes.cpp        |   0
 .../llvm_patches/lib/IR/Attributes.cpp.patch  |   0
 .../hpvm => hpvm}/test/CTestSuite/Makefile    |   0
 .../hpvm => hpvm}/test/CTestSuite/RUN.script  |   0
 .../hpvm => hpvm}/test/CTestSuite/gemm.c      |   0
 .../hpvm => hpvm}/test/CTestSuite/gemm_2.c    |   0
 .../test/MatrixMultiplication/Makefile        |   0
 .../test/MatrixMultiplication/gemm.c          |   0
 .../test/MatrixMultiplication/visc_gemm.ll    |   0
 .../MatrixMultiplication/visc_gemm_2_level.ll |   0
 .../visc_gemm_2_level_host.ll                 |   0
 .../visc_gemm_2_level_outedge.ll              |   0
 .../visc_gemm_2_level_param.ll                |   0
 .../MatrixMultiplication/visc_gemm_ptx.ll     |   0
 .../hpvm => hpvm}/test/edge/CMakeLists.txt    |   0
 .../test/edge/ESO_Very_Large_Telescope.jpg    | Bin
 .../hpvm => hpvm}/test/edge/EdgeDetect.cpp    |   0
 .../test/edge/PipelineEdgeDetect.cpp          |   0
 .../hpvm => hpvm}/test/edge/edgetest_10.png   | Bin
 {llvm/tools/hpvm => hpvm}/test/edge/house.png | Bin
 {llvm/tools/hpvm => hpvm}/test/edge/time.h    |   0
 .../test/gemm_opencl/matrixMul/Makefile       |   0
 .../test/gemm_opencl/matrixMul/gemm_opencl.c  |   0
 .../test/gemm_opencl/matrixMul/matrixMul.cl   |   0
 .../test/gemm_opencl/matrixMul/sgemm.c        |   0
 .../gemm_opencl/matrixMul/visc_gemm_opencl.ll |   0
 .../test/gemm_opencl/matrixMul_bc/Makefile    |   0
 .../gemm_opencl/matrixMul_bc/gemm_opencl.c    |   0
 .../gemm_opencl/matrixMul_bc/matrixMul_bc.cl  |   0
 .../test/gemm_opencl/matrixMul_bc/sgemm.c     |   0
 .../test/gemm_opencl/matrixMul_sh/Makefile    |   0
 .../gemm_opencl/matrixMul_sh/gemm_opencl.c    |   0
 .../gemm_opencl/matrixMul_sh/matrixMul_sh.cl  |   0
 .../test/gemm_opencl/matrixMul_sh/sgemm.c     |   0
 .../test/gemm_opencl/matrixMul_sh_bc/Makefile |   0
 .../gemm_opencl/matrixMul_sh_bc/gemm_opencl.c |   0
 .../matrixMul_sh_bc/matrixMul_sh_bc.cl        |   0
 .../test/gemm_opencl/matrixMul_sh_bc/sgemm.c  |   0
 {llvm/tools/hpvm => hpvm}/test/lit.local.cfg  |   0
 .../hpvm => hpvm}/test/parboil/DIRECTORIES    |   0
 .../tools/hpvm => hpvm}/test/parboil/LICENSE  |   0
 {llvm/tools/hpvm => hpvm}/test/parboil/README |   0
 .../test/parboil/README.benchmarks            |   0
 .../test/parboil/README.buildsystem           |   0
 .../test/parboil/RUN.parboil.script           |   0
 .../test/parboil/benchmarks/bfs/DESCRIPTION   |   0
 .../test/parboil/benchmarks/bfs/Makefile      |   0
 .../parboil/benchmarks/bfs/src/base/Makefile  |   0
 .../parboil/benchmarks/bfs/src/base/main.cc   |   0
 .../benchmarks/bfs/src/cuda/.__afs3805        |   0
 .../parboil/benchmarks/bfs/src/cuda/Makefile  |   0
 .../parboil/benchmarks/bfs/src/cuda/config.h  |   0
 .../parboil/benchmarks/bfs/src/cuda/kernel.cu |   0
 .../parboil/benchmarks/bfs/src/cuda/main.cu   |   0
 .../benchmarks/bfs/src/cuda_base/.__afs809D   |   0
 .../benchmarks/bfs/src/cuda_base/Makefile     |   0
 .../benchmarks/bfs/src/cuda_base/config.h     |   0
 .../benchmarks/bfs/src/cuda_base/kernel.cu    |   0
 .../benchmarks/bfs/src/cuda_base/main.cu      |   0
 .../benchmarks/bfs/src/omp_base/Makefile      |   0
 .../benchmarks/bfs/src/omp_base/main.cc       |   0
 .../benchmarks/bfs/src/opencl_base/Makefile   |   0
 .../bfs/src/opencl_base/OpenCL_common.cpp     |   0
 .../bfs/src/opencl_base/OpenCL_common.h       |   0
 .../benchmarks/bfs/src/opencl_base/config.h   |   0
 .../benchmarks/bfs/src/opencl_base/kernel.cl  |   0
 .../benchmarks/bfs/src/opencl_base/main.cpp   |   0
 .../bfs/src/opencl_cpu_baseline/Makefile      |   0
 .../src/opencl_cpu_baseline/OpenCL_common.cpp |   0
 .../src/opencl_cpu_baseline/OpenCL_common.h   |   0
 .../bfs/src/opencl_cpu_baseline/config.h      |   0
 .../src/opencl_cpu_baseline/kernel-spir64.ll  |   0
 .../bfs/src/opencl_cpu_baseline/kernel.cl     |   0
 .../bfs/src/opencl_cpu_baseline/main.cpp      |   0
 .../benchmarks/bfs/src/opencl_nvidia/Makefile |   0
 .../bfs/src/opencl_nvidia/OpenCL_common.cpp   |   0
 .../bfs/src/opencl_nvidia/OpenCL_common.h     |   0
 .../benchmarks/bfs/src/opencl_nvidia/config.h |   0
 .../bfs/src/opencl_nvidia/kernel.cl           |   0
 .../benchmarks/bfs/src/opencl_nvidia/main.cpp |   0
 .../parboil/benchmarks/bfs/src/visc/Makefile  |   0
 .../parboil/benchmarks/bfs/src/visc/config.h  |   0
 .../parboil/benchmarks/bfs/src/visc/main.cpp  |   0
 .../benchmarks/bfs/tools/compare-output       |   0
 .../test/parboil/benchmarks/cutcp/DESCRIPTION |   0
 .../test/parboil/benchmarks/cutcp/Makefile    |   0
 .../benchmarks/cutcp/src/base/Makefile        |   0
 .../parboil/benchmarks/cutcp/src/base/atom.h  |   0
 .../benchmarks/cutcp/src/base/cutcpu.c        |   0
 .../benchmarks/cutcp/src/base/cutoff.h        |   0
 .../parboil/benchmarks/cutcp/src/base/excl.c  |   0
 .../parboil/benchmarks/cutcp/src/base/main.c  |   0
 .../benchmarks/cutcp/src/base/output.c        |   0
 .../benchmarks/cutcp/src/base/output.h        |   0
 .../benchmarks/cutcp/src/base/readatom.c      |   0
 .../benchmarks/cutcp/src/cuda/Makefile        |   0
 .../parboil/benchmarks/cutcp/src/cuda/atom.h  |   0
 .../benchmarks/cutcp/src/cuda/cutcpu.c        |   0
 .../benchmarks/cutcp/src/cuda/cutoff.h        |   0
 .../cutcp/src/cuda/cutoff6overlap.cu          |   0
 .../parboil/benchmarks/cutcp/src/cuda/excl.c  |   0
 .../parboil/benchmarks/cutcp/src/cuda/main.c  |   0
 .../benchmarks/cutcp/src/cuda/output.c        |   0
 .../benchmarks/cutcp/src/cuda/output.h        |   0
 .../benchmarks/cutcp/src/cuda/readatom.c      |   0
 .../benchmarks/cutcp/src/cuda_base/Makefile   |   0
 .../benchmarks/cutcp/src/cuda_base/atom.h     |   0
 .../benchmarks/cutcp/src/cuda_base/cutcpu.c   |   0
 .../benchmarks/cutcp/src/cuda_base/cutoff.cu  |   0
 .../benchmarks/cutcp/src/cuda_base/cutoff.h   |   0
 .../benchmarks/cutcp/src/cuda_base/excl.c     |   0
 .../benchmarks/cutcp/src/cuda_base/main.c     |   0
 .../benchmarks/cutcp/src/cuda_base/output.c   |   0
 .../benchmarks/cutcp/src/cuda_base/output.h   |   0
 .../benchmarks/cutcp/src/cuda_base/readatom.c |   0
 .../benchmarks/cutcp/src/omp_base/Makefile    |   0
 .../benchmarks/cutcp/src/omp_base/atom.h      |   0
 .../benchmarks/cutcp/src/omp_base/cutcpu.c    |   0
 .../benchmarks/cutcp/src/omp_base/cutoff.h    |   0
 .../benchmarks/cutcp/src/omp_base/excl.c      |   0
 .../benchmarks/cutcp/src/omp_base/main.c      |   0
 .../benchmarks/cutcp/src/omp_base/output.c    |   0
 .../benchmarks/cutcp/src/omp_base/output.h    |   0
 .../benchmarks/cutcp/src/omp_base/readatom.c  |   0
 .../benchmarks/cutcp/src/opencl_base/Makefile |   0
 .../benchmarks/cutcp/src/opencl_base/atom.h   |   0
 .../benchmarks/cutcp/src/opencl_base/cutcpu.c |   0
 .../benchmarks/cutcp/src/opencl_base/cutoff.c |   0
 .../benchmarks/cutcp/src/opencl_base/cutoff.h |   0
 .../benchmarks/cutcp/src/opencl_base/excl.c   |   0
 .../cutcp/src/opencl_base/kernel.cl           |   0
 .../benchmarks/cutcp/src/opencl_base/macros.h |   0
 .../benchmarks/cutcp/src/opencl_base/main.c   |   0
 .../benchmarks/cutcp/src/opencl_base/ocl.c    |   0
 .../benchmarks/cutcp/src/opencl_base/ocl.h    |   0
 .../benchmarks/cutcp/src/opencl_base/output.c |   0
 .../benchmarks/cutcp/src/opencl_base/output.h |   0
 .../cutcp/src/opencl_base/readatom.c          |   0
 .../cutcp/src/opencl_cpu_baseline/Makefile    |   0
 .../cutcp/src/opencl_cpu_baseline/atom.h      |   0
 .../cutcp/src/opencl_cpu_baseline/cutcpu.c    |   0
 .../cutcp/src/opencl_cpu_baseline/cutoff.h    |   0
 .../src/opencl_cpu_baseline/cutoff6overlap.c  |   0
 .../cutcp/src/opencl_cpu_baseline/excl.c      |   0
 .../cutcp/src/opencl_cpu_baseline/kernel.cl   |   0
 .../src/opencl_cpu_baseline/kernel_visc.cl    |   0
 .../opencl_cpu_baseline/kernel_visc_x64.ll    |   0
 .../opencl_cpu_baseline/kernel_visc_x64.spir  | Bin
 .../src/opencl_cpu_baseline/kernel_x64.ll     |   0
 .../cutcp/src/opencl_cpu_baseline/macros.h    |   0
 .../cutcp/src/opencl_cpu_baseline/main.c      |   0
 .../cutcp/src/opencl_cpu_baseline/ocl.c       |   0
 .../cutcp/src/opencl_cpu_baseline/ocl.h       |   0
 .../cutcp/src/opencl_cpu_baseline/output.c    |   0
 .../cutcp/src/opencl_cpu_baseline/output.h    |   0
 .../cutcp/src/opencl_cpu_baseline/readatom.c  |   0
 .../cutcp/src/opencl_nvidia/Makefile          |   0
 .../benchmarks/cutcp/src/opencl_nvidia/atom.h |   0
 .../cutcp/src/opencl_nvidia/cutcpu.c          |   0
 .../cutcp/src/opencl_nvidia/cutoff.h          |   0
 .../cutcp/src/opencl_nvidia/cutoff6overlap.c  |   0
 .../benchmarks/cutcp/src/opencl_nvidia/excl.c |   0
 .../cutcp/src/opencl_nvidia/kernel.cl         |   0
 .../cutcp/src/opencl_nvidia/macros.h          |   0
 .../benchmarks/cutcp/src/opencl_nvidia/main.c |   0
 .../benchmarks/cutcp/src/opencl_nvidia/ocl.c  |   0
 .../benchmarks/cutcp/src/opencl_nvidia/ocl.h  |   0
 .../cutcp/src/opencl_nvidia/output.c          |   0
 .../cutcp/src/opencl_nvidia/output.h          |   0
 .../cutcp/src/opencl_nvidia/readatom.c        |   0
 .../benchmarks/cutcp/src/visc/Makefile        |   0
 .../parboil/benchmarks/cutcp/src/visc/atom.h  |   0
 .../benchmarks/cutcp/src/visc/cutcpu.c        |   0
 .../benchmarks/cutcp/src/visc/cutoff.h        |   0
 .../cutcp/src/visc/cutoff6overlap.c           |   0
 .../parboil/benchmarks/cutcp/src/visc/excl.c  |   0
 .../benchmarks/cutcp/src/visc/kernel.cl       |   0
 .../benchmarks/cutcp/src/visc/macros.h        |   0
 .../benchmarks/cutcp/src/visc/main.cpp        |   0
 .../parboil/benchmarks/cutcp/src/visc/ocl.c   |   0
 .../parboil/benchmarks/cutcp/src/visc/ocl.h   |   0
 .../benchmarks/cutcp/src/visc/output.c        |   0
 .../benchmarks/cutcp/src/visc/output.h        |   0
 .../benchmarks/cutcp/src/visc/readatom.c      |   0
 .../benchmarks/cutcp/tools/compare-output     |   0
 .../test/parboil/benchmarks/histo/DESCRIPTION |   0
 .../test/parboil/benchmarks/histo/Makefile    |   0
 .../parboil/benchmarks/histo/histo.host.ll    |   0
 .../parboil/benchmarks/histo/histo.nvptx.s    |   0
 .../benchmarks/histo/src/base/Makefile        |   0
 .../parboil/benchmarks/histo/src/base/bmp.h   |   0
 .../parboil/benchmarks/histo/src/base/main.c  |   0
 .../parboil/benchmarks/histo/src/base/util.c  |   0
 .../parboil/benchmarks/histo/src/base/util.h  |   0
 .../benchmarks/histo/src/cuda/Makefile        |   0
 .../parboil/benchmarks/histo/src/cuda/bmp.h   |   0
 .../benchmarks/histo/src/cuda/histo_final.cu  |   0
 .../histo/src/cuda/histo_intermediates.cu     |   0
 .../benchmarks/histo/src/cuda/histo_main.cu   |   0
 .../histo/src/cuda/histo_prescan.cu           |   0
 .../parboil/benchmarks/histo/src/cuda/main.cu |   0
 .../parboil/benchmarks/histo/src/cuda/util.cu |   0
 .../parboil/benchmarks/histo/src/cuda/util.h  |   0
 .../benchmarks/histo/src/cuda_base/Makefile   |   0
 .../benchmarks/histo/src/cuda_base/bmp.h      |   0
 .../histo/src/cuda_base/histo_final.cu        |   0
 .../src/cuda_base/histo_intermediates.cu      |   0
 .../histo/src/cuda_base/histo_main.cu         |   0
 .../histo/src/cuda_base/histo_prescan.cu      |   0
 .../benchmarks/histo/src/cuda_base/main.cu    |   0
 .../benchmarks/histo/src/cuda_base/util.cu    |   0
 .../benchmarks/histo/src/cuda_base/util.h     |   0
 .../benchmarks/histo/src/omp_base/Makefile    |   0
 .../benchmarks/histo/src/omp_base/bmp.h       |   0
 .../benchmarks/histo/src/omp_base/main.c      |   0
 .../benchmarks/histo/src/omp_base/util.c      |   0
 .../benchmarks/histo/src/omp_base/util.h      |   0
 .../benchmarks/histo/src/opencl_base/Makefile |   0
 .../histo/src/opencl_base/OpenCL_common.cpp   |   0
 .../histo/src/opencl_base/OpenCL_common.h     |   0
 .../benchmarks/histo/src/opencl_base/bmp.h    |   0
 .../histo/src/opencl_base/histo_final.cl      |   0
 .../src/opencl_base/histo_intermediates.cl    |   0
 .../histo/src/opencl_base/histo_main.cl       |   0
 .../histo/src/opencl_base/histo_prescan.cl    |   0
 .../benchmarks/histo/src/opencl_base/main.cpp |   0
 .../benchmarks/histo/src/opencl_base/util.cpp |   0
 .../benchmarks/histo/src/opencl_base/util.h   |   0
 .../histo/src/opencl_cpu_baseline/Makefile    |   0
 .../src/opencl_cpu_baseline/OpenCL_common.cpp |   0
 .../src/opencl_cpu_baseline/OpenCL_common.h   |   0
 .../histo/src/opencl_cpu_baseline/bmp.h       |   0
 .../src/opencl_cpu_baseline/histo_final.cl    |   0
 .../histo_intermediates.cl                    |   0
 .../src/opencl_cpu_baseline/histo_main.cl     |   0
 .../src/opencl_cpu_baseline/histo_prescan.cl  |   0
 .../histo/src/opencl_cpu_baseline/kernel.cl   |   0
 .../src/opencl_cpu_baseline/kernel_x64.ll     |   0
 .../src/opencl_cpu_baseline/kernel_x64.spir   | Bin
 .../histo/src/opencl_cpu_baseline/main.cpp    |   0
 .../histo/src/opencl_cpu_baseline/util.cpp    |   0
 .../histo/src/opencl_cpu_baseline/util.h      |   0
 .../histo/src/opencl_nvidia/Makefile          |   0
 .../histo/src/opencl_nvidia/OpenCL_common.cpp |   0
 .../histo/src/opencl_nvidia/OpenCL_common.h   |   0
 .../benchmarks/histo/src/opencl_nvidia/bmp.h  |   0
 .../histo/src/opencl_nvidia/histo_final.cl    |   0
 .../src/opencl_nvidia/histo_intermediates.cl  |   0
 .../histo/src/opencl_nvidia/histo_main.cl     |   0
 .../histo/src/opencl_nvidia/histo_prescan.cl  |   0
 .../histo/src/opencl_nvidia/kernel.cl         |   0
 .../histo/src/opencl_nvidia/main.cpp          |   0
 .../histo/src/opencl_nvidia/util.cpp          |   0
 .../benchmarks/histo/src/opencl_nvidia/util.h |   0
 .../benchmarks/histo/src/threaded/FauxBlock.c |   0
 .../benchmarks/histo/src/threaded/FauxBlock.h |   0
 .../benchmarks/histo/src/threaded/Makefile    |   0
 .../benchmarks/histo/src/threaded/bmp.h       |   0
 .../benchmarks/histo/src/threaded/main.c      |   0
 .../benchmarks/histo/src/threaded/util.c      |   0
 .../benchmarks/histo/src/threaded/util.h      |   0
 .../benchmarks/histo/src/visc/Makefile        |   0
 .../parboil/benchmarks/histo/src/visc/bmp.h   |   0
 .../benchmarks/histo/src/visc/main.cpp        |   0
 .../benchmarks/histo/src/visc/util.cpp        |   0
 .../parboil/benchmarks/histo/src/visc/util.h  |   0
 .../benchmarks/histo/src/visc_one/main.cpp    |   0
 .../benchmarks/histo/tools/compare-output     |   0
 .../parboil/benchmarks/hpvm-cava/.gitignore   |   0
 .../parboil/benchmarks/hpvm-cava/CREDITS.TXT  |   0
 .../test/parboil/benchmarks/hpvm-cava/LICENSE |   0
 .../parboil/benchmarks/hpvm-cava/Makefile     |   0
 .../hpvm-cava/Makefile.config.example         |   0
 .../parboil/benchmarks/hpvm-cava/README.md    |   0
 .../cam_models/NikonD7000/README.txt          |   0
 .../cam_models/NikonD7000/jpg2raw_coefs.txt   |   0
 .../NikonD7000/jpg2raw_ctrlPoints.txt         |   0
 .../NikonD7000/jpg2raw_destPoints.txt         |   0
 .../NikonD7000/jpg2raw_respFcns.txt           |   0
 .../NikonD7000/jpg2raw_transform.txt          |   0
 .../NikonD7000/jpg2raw_validRange.txt         |   0
 .../cam_models/NikonD7000/raw2jpg_coefs.txt   |   0
 .../NikonD7000/raw2jpg_coefs_debug.txt        |   0
 .../NikonD7000/raw2jpg_ctrlPoints.txt         |   0
 .../NikonD7000/raw2jpg_ctrlPoints_debug.txt   |   0
 .../NikonD7000/raw2jpg_destPoints.txt         |   0
 .../NikonD7000/raw2jpg_respFcns.txt           |   0
 .../NikonD7000/raw2jpg_transform.txt          |   0
 .../NikonD7000/raw2jpg_validRange.txt         |   0
 .../parboil/benchmarks/hpvm-cava/convert.sh   |   0
 .../hpvm-cava/docs/hpvm-cava_single-node.png  | Bin
 .../hpvm-cava/example-face/README.md          |   0
 .../example-tulip-small/raw_tulip-small.bin   | Bin
 .../hpvm-cava/example-tulips/._raw_tulips.bin | Bin
 .../hpvm-cava/example-tulips/._raw_tulips.png | Bin
 .../hpvm-cava/example-tulips/._tulips.bin     | Bin
 .../hpvm-cava/example-tulips/._tulips.png     | Bin
 .../example-tulips/._tulips_demosaic.bin      | Bin
 .../example-tulips/._tulips_demosaic.png      | Bin
 .../example-tulips/._tulips_denoise.bin       | Bin
 .../example-tulips/._tulips_denoise.png       | Bin
 .../example-tulips/._tulips_gamut.bin         | Bin
 .../example-tulips/._tulips_gamut.png         | Bin
 .../example-tulips/._tulips_tone.bin          | Bin
 .../example-tulips/._tulips_tone.png          | Bin
 .../example-tulips/._tulips_transform.bin     | Bin
 .../example-tulips/._tulips_transform.png     | Bin
 .../hpvm-cava/example-tulips/raw_tulips.bin   | Bin
 .../hpvm-cava/run-camera-pipeline.sh          |   0
 .../benchmarks/hpvm-cava/scripts/Makefile     |   0
 .../benchmarks/hpvm-cava/scripts/cmodule.py   |   0
 .../hpvm-cava/scripts/convert_image.py        |   0
 .../benchmarks/hpvm-cava/scripts/gamut_map.cc |   0
 .../benchmarks/hpvm-cava/scripts/gamut_map.h  |   0
 .../benchmarks/hpvm-cava/scripts/gamut_map.i  |   0
 .../hpvm-cava/scripts/gamut_map_wrap.cc       |   0
 .../hpvm-cava/scripts/load_and_convert.py     |   0
 .../benchmarks/hpvm-cava/scripts/numpy.i      |   0
 .../hpvm-cava/scripts/split_trace.py          |   0
 .../hpvm-cava/src/cam-vision-native           | Bin
 .../benchmarks/hpvm-cava/src/cam_pipe.c       |   0
 .../benchmarks/hpvm-cava/src/cam_pipe.h       |   0
 .../hpvm-cava/src/cam_pipe_utility.c          |   0
 .../hpvm-cava/src/cam_pipe_utility.h          |   0
 .../parboil/benchmarks/hpvm-cava/src/defs.h   |   0
 .../benchmarks/hpvm-cava/src/dma_interface.c  |   0
 .../benchmarks/hpvm-cava/src/dma_interface.h  |   0
 .../benchmarks/hpvm-cava/src/gem5_harness.h   |   0
 .../benchmarks/hpvm-cava/src/load_cam_model.c |   0
 .../benchmarks/hpvm-cava/src/load_cam_model.h |   0
 .../parboil/benchmarks/hpvm-cava/src/main.c   |   0
 .../benchmarks/hpvm-cava/src/pipe_stages.c    |   0
 .../benchmarks/hpvm-cava/src/pipe_stages.h    |   0
 .../benchmarks/hpvm-cava/src/rename.sh        |   0
 .../benchmarks/hpvm-cava/src/utility.c        |   0
 .../benchmarks/hpvm-cava/src/utility.h        |   0
 .../parboil/benchmarks/hpvm-cava/src/visc.h   |   0
 .../test/parboil/benchmarks/kmeans/Makefile   |   0
 .../benchmarks/kmeans/src/opencl/Makefile     |   0
 .../benchmarks/kmeans/src/opencl/README       |   0
 .../benchmarks/kmeans/src/opencl/cluster.c    |   0
 .../benchmarks/kmeans/src/opencl/getopt.c     |   0
 .../benchmarks/kmeans/src/opencl/getopt.h     |   0
 .../benchmarks/kmeans/src/opencl/kmeans.cl    |   0
 .../benchmarks/kmeans/src/opencl/kmeans.cpp   |   0
 .../benchmarks/kmeans/src/opencl/kmeans.h     |   0
 .../kmeans/src/opencl/kmeans_clustering.c     |   0
 .../benchmarks/kmeans/src/opencl/read_input.c |   0
 .../benchmarks/kmeans/src/opencl/rmse.c       |   0
 .../parboil/benchmarks/kmeans/src/opencl/run  |   0
 .../benchmarks/kmeans/src/opencl/unistd.h     |   0
 .../benchmarks/kmeans/src/visc/Makefile       |   0
 .../parboil/benchmarks/kmeans/src/visc/README |   0
 .../benchmarks/kmeans/src/visc/cluster.c      |   0
 .../benchmarks/kmeans/src/visc/getopt.c       |   0
 .../benchmarks/kmeans/src/visc/getopt.h       |   0
 .../benchmarks/kmeans/src/visc/kmeans.cl      |   0
 .../benchmarks/kmeans/src/visc/kmeans.cpp     |   0
 .../benchmarks/kmeans/src/visc/kmeans.h       |   0
 .../kmeans/src/visc/kmeans_clustering.c       |   0
 .../benchmarks/kmeans/src/visc/read_input.c   |   0
 .../parboil/benchmarks/kmeans/src/visc/rmse.c |   0
 .../parboil/benchmarks/kmeans/src/visc/run    |   0
 .../benchmarks/kmeans/src/visc/unistd.h       |   0
 .../benchmarks/kmeans/tools/compare-output    |   0
 .../test/parboil/benchmarks/lbm/DESCRIPTION   |   0
 .../test/parboil/benchmarks/lbm/Makefile      |   0
 .../parboil/benchmarks/lbm/src/cpu/Makefile   |   0
 .../parboil/benchmarks/lbm/src/cpu/config.h   |   0
 .../test/parboil/benchmarks/lbm/src/cpu/lbm.c |   0
 .../test/parboil/benchmarks/lbm/src/cpu/lbm.h |   0
 .../benchmarks/lbm/src/cpu/lbm_1d_array.h     |   0
 .../parboil/benchmarks/lbm/src/cpu/main.c     |   0
 .../parboil/benchmarks/lbm/src/cpu/main.h     |   0
 .../parboil/benchmarks/lbm/src/cuda/Makefile  |   0
 .../benchmarks/lbm/src/cuda/layout_config.h   |   0
 .../parboil/benchmarks/lbm/src/cuda/lbm.cu    |   0
 .../parboil/benchmarks/lbm/src/cuda/lbm.h     |   0
 .../benchmarks/lbm/src/cuda/lbm_kernel.cu     |   0
 .../benchmarks/lbm/src/cuda/lbm_macros.h      |   0
 .../parboil/benchmarks/lbm/src/cuda/main.cc   |   0
 .../parboil/benchmarks/lbm/src/cuda/main.h    |   0
 .../benchmarks/lbm/src/cuda_base/Makefile     |   0
 .../lbm/src/cuda_base/layout_config.h         |   0
 .../benchmarks/lbm/src/cuda_base/lbm.cu       |   0
 .../benchmarks/lbm/src/cuda_base/lbm.h        |   0
 .../lbm/src/cuda_base/lbm_kernel.cu           |   0
 .../benchmarks/lbm/src/cuda_base/lbm_macros.h |   0
 .../benchmarks/lbm/src/cuda_base/main.cc      |   0
 .../benchmarks/lbm/src/cuda_base/main.h       |   0
 .../benchmarks/lbm/src/omp_cpu/Makefile       |   0
 .../benchmarks/lbm/src/omp_cpu/config.h       |   0
 .../parboil/benchmarks/lbm/src/omp_cpu/lbm.c  |   0
 .../parboil/benchmarks/lbm/src/omp_cpu/lbm.h  |   0
 .../benchmarks/lbm/src/omp_cpu/lbm_1d_array.h |   0
 .../parboil/benchmarks/lbm/src/omp_cpu/main.c |   0
 .../parboil/benchmarks/lbm/src/omp_cpu/main.h |   0
 .../benchmarks/lbm/src/opencl_base/Makefile   |   0
 .../benchmarks/lbm/src/opencl_base/kernel.cl  |   0
 .../lbm/src/opencl_base/layout_config.h       |   0
 .../benchmarks/lbm/src/opencl_base/lbm.c      |   0
 .../benchmarks/lbm/src/opencl_base/lbm.h      |   0
 .../lbm/src/opencl_base/lbm_macros.h          |   0
 .../benchmarks/lbm/src/opencl_base/main.c     |   0
 .../benchmarks/lbm/src/opencl_base/main.h     |   0
 .../benchmarks/lbm/src/opencl_base/ocl.c      |   0
 .../benchmarks/lbm/src/opencl_base/ocl.h      |   0
 .../lbm/src/opencl_cpu_baseline/Makefile      |   0
 .../lbm/src/opencl_cpu_baseline/kernel.cl     |   0
 .../src/opencl_cpu_baseline/kernel_offline.cl |   0
 .../src/opencl_cpu_baseline/layout_config.h   |   0
 .../lbm/src/opencl_cpu_baseline/lbm.c         |   0
 .../lbm/src/opencl_cpu_baseline/lbm.h         |   0
 .../lbm/src/opencl_cpu_baseline/lbm_macros.h  |   0
 .../lbm/src/opencl_cpu_baseline/main.c        |   0
 .../lbm/src/opencl_cpu_baseline/main.h        |   0
 .../lbm/src/opencl_cpu_baseline/ocl.c         |   0
 .../lbm/src/opencl_cpu_baseline/ocl.h         |   0
 .../lbm/src/opencl_cpu_long/Makefile          |   0
 .../lbm/src/opencl_cpu_long/kernel.cl         |   0
 .../lbm/src/opencl_cpu_long/kernel.ir         | Bin
 .../lbm/src/opencl_cpu_long/kernel_offline.cl |   0
 .../lbm/src/opencl_cpu_long/layout_config.h   |   0
 .../benchmarks/lbm/src/opencl_cpu_long/lbm.c  |   0
 .../benchmarks/lbm/src/opencl_cpu_long/lbm.h  |   0
 .../lbm/src/opencl_cpu_long/lbm_macros.h      |   0
 .../benchmarks/lbm/src/opencl_cpu_long/main.c |   0
 .../benchmarks/lbm/src/opencl_cpu_long/main.h |   0
 .../benchmarks/lbm/src/opencl_cpu_long/ocl.c  |   0
 .../benchmarks/lbm/src/opencl_cpu_long/ocl.h  |   0
 .../lbm/src/opencl_cpu_short/Makefile         |   0
 .../lbm/src/opencl_cpu_short/kernel.cl        |   0
 .../lbm/src/opencl_cpu_short/kernel.ir        | Bin
 .../src/opencl_cpu_short/kernel_offline.cl    |   0
 .../lbm/src/opencl_cpu_short/layout_config.h  |   0
 .../benchmarks/lbm/src/opencl_cpu_short/lbm.c |   0
 .../benchmarks/lbm/src/opencl_cpu_short/lbm.h |   0
 .../lbm/src/opencl_cpu_short/lbm_macros.h     |   0
 .../lbm/src/opencl_cpu_short/main.c           |   0
 .../lbm/src/opencl_cpu_short/main.h           |   0
 .../benchmarks/lbm/src/opencl_cpu_short/ocl.c |   0
 .../benchmarks/lbm/src/opencl_cpu_short/ocl.h |   0
 .../benchmarks/lbm/src/opencl_nvidia/Makefile |   0
 .../lbm/src/opencl_nvidia/kernel.cl           |   0
 .../lbm/src/opencl_nvidia/kernel_offline.cl   |   0
 .../lbm/src/opencl_nvidia/layout_config.h     |   0
 .../benchmarks/lbm/src/opencl_nvidia/lbm.c    |   0
 .../benchmarks/lbm/src/opencl_nvidia/lbm.h    |   0
 .../lbm/src/opencl_nvidia/lbm_macros.h        |   0
 .../benchmarks/lbm/src/opencl_nvidia/main.c   |   0
 .../benchmarks/lbm/src/opencl_nvidia/main.h   |   0
 .../benchmarks/lbm/src/opencl_nvidia/ocl.c    |   0
 .../benchmarks/lbm/src/opencl_nvidia/ocl.h    |   0
 .../lbm/src/opencl_nvidia_long/Makefile       |   0
 .../lbm/src/opencl_nvidia_long/kernel.cl      |   0
 .../src/opencl_nvidia_long/kernel_offline.cl  |   0
 .../src/opencl_nvidia_long/layout_config.h    |   0
 .../lbm/src/opencl_nvidia_long/lbm.c          |   0
 .../lbm/src/opencl_nvidia_long/lbm.h          |   0
 .../lbm/src/opencl_nvidia_long/lbm_macros.h   |   0
 .../lbm/src/opencl_nvidia_long/main.c         |   0
 .../lbm/src/opencl_nvidia_long/main.h         |   0
 .../lbm/src/opencl_nvidia_long/ocl.c          |   0
 .../lbm/src/opencl_nvidia_long/ocl.h          |   0
 .../lbm/src/opencl_nvidia_short/Makefile      |   0
 .../lbm/src/opencl_nvidia_short/kernel.cl     |   0
 .../src/opencl_nvidia_short/kernel_offline.cl |   0
 .../src/opencl_nvidia_short/layout_config.h   |   0
 .../lbm/src/opencl_nvidia_short/lbm.c         |   0
 .../lbm/src/opencl_nvidia_short/lbm.h         |   0
 .../lbm/src/opencl_nvidia_short/lbm_macros.h  |   0
 .../lbm/src/opencl_nvidia_short/main.c        |   0
 .../lbm/src/opencl_nvidia_short/main.h        |   0
 .../lbm/src/opencl_nvidia_short/ocl.c         |   0
 .../lbm/src/opencl_nvidia_short/ocl.h         |   0
 .../parboil/benchmarks/lbm/src/visc/Makefile  |   0
 .../benchmarks/lbm/src/visc/layout_config.h   |   0
 .../parboil/benchmarks/lbm/src/visc/lbm.cpp   |   0
 .../parboil/benchmarks/lbm/src/visc/lbm.h     |   0
 .../benchmarks/lbm/src/visc/lbm_macros.h      |   0
 .../parboil/benchmarks/lbm/src/visc/main.cpp  |   0
 .../parboil/benchmarks/lbm/src/visc/main.h    |   0
 .../benchmarks/lbm/tools/compare-output       |   0
 .../parboil/benchmarks/linear-svm/Makefile    |   0
 .../benchmarks/linear-svm/linear-svm.visc.ll  |   0
 .../linear-svm/src/visc_cm/Makefile           |   0
 .../benchmarks/linear-svm/src/visc_cm/io.cc   |   0
 .../benchmarks/linear-svm/src/visc_cm/main.cc |   0
 .../test/parboil/benchmarks/llvm-40-34.py     |   0
 .../benchmarks/merge-tests/DESCRIPTION        |   0
 .../parboil/benchmarks/merge-tests/Makefile   |   0
 .../merge-tests/src/2DLeaf/Makefile           |   0
 .../benchmarks/merge-tests/src/2DLeaf/io.cc   |   0
 .../benchmarks/merge-tests/src/2DLeaf/main.cc |   0
 .../merge-tests/src/2ILeaf/Makefile           |   0
 .../benchmarks/merge-tests/src/2ILeaf/io.cc   |   0
 .../benchmarks/merge-tests/src/2ILeaf/main.cc |   0
 .../merge-tests/src/2ILeafD/Makefile          |   0
 .../benchmarks/merge-tests/src/2ILeafD/io.cc  |   0
 .../merge-tests/src/2ILeafD/main.cc           |   0
 .../merge-tests/src/2ILeafS/Makefile          |   0
 .../benchmarks/merge-tests/src/2ILeafS/io.cc  |   0
 .../merge-tests/src/2ILeafS/main.cc           |   0
 .../merge-tests/src/2LevelACAC/Makefile       |   0
 .../merge-tests/src/2LevelACAC/io.cc          |   0
 .../merge-tests/src/2LevelACAC/main.cc        |   0
 .../merge-tests/src/2LevelACC/Makefile        |   0
 .../merge-tests/src/2LevelACC/io.cc           |   0
 .../merge-tests/src/2LevelACC/main.cc         |   0
 .../merge-tests/src/2LevelCAC/Makefile        |   0
 .../merge-tests/src/2LevelCAC/io.cc           |   0
 .../merge-tests/src/2LevelCAC/main.cc         |   0
 .../merge-tests/src/2LevelCC/Makefile         |   0
 .../benchmarks/merge-tests/src/2LevelCC/io.cc |   0
 .../merge-tests/src/2LevelCC/main.cc          |   0
 .../merge-tests/src/2LevelICC/Makefile        |   0
 .../merge-tests/src/2LevelICC/io.cc           |   0
 .../merge-tests/src/2LevelICC/main.cc         |   0
 .../merge-tests/tools/compare-output          |   0
 .../benchmarks/mri-gridding/DESCRIPTION       |   0
 .../mri-gridding/src/base/CPU_kernels.c       |   0
 .../mri-gridding/src/base/CPU_kernels.h       |   0
 .../benchmarks/mri-gridding/src/base/Makefile |   0
 .../mri-gridding/src/base/UDTypes.h           |   0
 .../benchmarks/mri-gridding/src/base/main.c   |   0
 .../mri-gridding/src/cuda-base/CPU_kernels.c  |   0
 .../mri-gridding/src/cuda-base/CPU_kernels.h  |   0
 .../src/cuda-base/CUDA_interface.cu           |   0
 .../src/cuda-base/CUDA_interface.h            |   0
 .../mri-gridding/src/cuda-base/GPU_kernels.cu |   0
 .../mri-gridding/src/cuda-base/Makefile       |   0
 .../mri-gridding/src/cuda-base/UDTypes.h      |   0
 .../mri-gridding/src/cuda-base/main.cu        |   0
 .../src/cuda-base/scanLargeArray.cu           |   0
 .../src/cuda-base/scanLargeArray.h            |   0
 .../mri-gridding/src/cuda-base/sort.cu        |   0
 .../mri-gridding/src/cuda-base/sort.h         |   0
 .../mri-gridding/src/cuda/CPU_kernels.c       |   0
 .../mri-gridding/src/cuda/CPU_kernels.h       |   0
 .../mri-gridding/src/cuda/CUDA_interface.cu   |   0
 .../mri-gridding/src/cuda/CUDA_interface.h    |   0
 .../mri-gridding/src/cuda/GPU_kernels.cu      |   0
 .../benchmarks/mri-gridding/src/cuda/Makefile |   0
 .../mri-gridding/src/cuda/UDTypes.h           |   0
 .../benchmarks/mri-gridding/src/cuda/main.cu  |   0
 .../mri-gridding/src/cuda/scanLargeArray.cu   |   0
 .../mri-gridding/src/cuda/scanLargeArray.h    |   0
 .../benchmarks/mri-gridding/src/cuda/sort.cu  |   0
 .../benchmarks/mri-gridding/src/cuda/sort.h   |   0
 .../mri-gridding/src/omp_base/CPU_kernels.c   |   0
 .../mri-gridding/src/omp_base/CPU_kernels.h   |   0
 .../mri-gridding/src/omp_base/Makefile        |   0
 .../mri-gridding/src/omp_base/UDTypes.h       |   0
 .../mri-gridding/src/omp_base/main.c          |   0
 .../src/opencl_base/CPU_kernels.c             |   0
 .../src/opencl_base/CPU_kernels.h             |   0
 .../src/opencl_base/GPU_kernels.cl            |   0
 .../mri-gridding/src/opencl_base/Makefile     |   0
 .../src/opencl_base/OpenCL_common.cpp         |   0
 .../src/opencl_base/OpenCL_common.h           |   0
 .../src/opencl_base/OpenCL_interface.cpp      |   0
 .../src/opencl_base/OpenCL_interface.h        |   0
 .../mri-gridding/src/opencl_base/UDTypes.h    |   0
 .../mri-gridding/src/opencl_base/main.cpp     |   0
 .../src/opencl_base/scanLargeArray.cl         |   0
 .../src/opencl_base/scanLargeArray.cpp        |   0
 .../src/opencl_base/scanLargeArray.h          |   0
 .../mri-gridding/src/opencl_base/sort.cl      |   0
 .../mri-gridding/src/opencl_base/sort.cpp     |   0
 .../mri-gridding/src/opencl_base/sort.h       |   0
 .../src/opencl_nvidia/CPU_kernels.c           |   0
 .../src/opencl_nvidia/CPU_kernels.h           |   0
 .../src/opencl_nvidia/GPU_kernels.cl          |   0
 .../mri-gridding/src/opencl_nvidia/Makefile   |   0
 .../src/opencl_nvidia/OpenCL_common.cpp       |   0
 .../src/opencl_nvidia/OpenCL_common.h         |   0
 .../src/opencl_nvidia/OpenCL_interface.cpp    |   0
 .../src/opencl_nvidia/OpenCL_interface.h      |   0
 .../mri-gridding/src/opencl_nvidia/UDTypes.h  |   0
 .../mri-gridding/src/opencl_nvidia/main.cpp   |   0
 .../src/opencl_nvidia/scanLargeArray.cl       |   0
 .../src/opencl_nvidia/scanLargeArray.cpp      |   0
 .../src/opencl_nvidia/scanLargeArray.h        |   0
 .../mri-gridding/src/opencl_nvidia/sort.cl    |   0
 .../mri-gridding/src/opencl_nvidia/sort.cpp   |   0
 .../mri-gridding/src/opencl_nvidia/sort.h     |   0
 .../mri-gridding/src/visc/CPU_kernels.c       |   0
 .../mri-gridding/src/visc/CPU_kernels.h       |   0
 .../mri-gridding/src/visc/GPU_kernels.cl      |   0
 .../benchmarks/mri-gridding/src/visc/Makefile |   0
 .../mri-gridding/src/visc/OpenCL_common.cpp   |   0
 .../mri-gridding/src/visc/OpenCL_common.h     |   0
 .../src/visc/OpenCL_interface.cpp             |   0
 .../mri-gridding/src/visc/OpenCL_interface.h  |   0
 .../mri-gridding/src/visc/UDTypes.h           |   0
 .../benchmarks/mri-gridding/src/visc/main.cpp |   0
 .../mri-gridding/src/visc/scanLargeArray.cl   |   0
 .../mri-gridding/src/visc/scanLargeArray.cpp  |   0
 .../mri-gridding/src/visc/scanLargeArray.h    |   0
 .../benchmarks/mri-gridding/src/visc/sort.cl  |   0
 .../benchmarks/mri-gridding/src/visc/sort.cpp |   0
 .../benchmarks/mri-gridding/src/visc/sort.h   |   0
 .../mri-gridding/tools/compare-output         |   0
 .../test/parboil/benchmarks/mri-q/DESCRIPTION |   0
 .../test/parboil/benchmarks/mri-q/Makefile    |   0
 .../benchmarks/mri-q/recycle/base/Makefile    |   0
 .../benchmarks/mri-q/recycle/base/computeQ.cc |   0
 .../benchmarks/mri-q/recycle/base/file.cc     |   0
 .../benchmarks/mri-q/recycle/base/file.h      |   0
 .../benchmarks/mri-q/recycle/base/main.c      |   0
 .../parboil/benchmarks/mri-q/src/cpu/Makefile |   0
 .../benchmarks/mri-q/src/cpu/computeQ.cc      |   0
 .../parboil/benchmarks/mri-q/src/cpu/file.cc  |   0
 .../parboil/benchmarks/mri-q/src/cpu/file.h   |   0
 .../parboil/benchmarks/mri-q/src/cpu/main.c   |   0
 .../benchmarks/mri-q/src/cuda/Makefile        |   0
 .../benchmarks/mri-q/src/cuda/computeQ.cu     |   0
 .../parboil/benchmarks/mri-q/src/cuda/file.cc |   0
 .../parboil/benchmarks/mri-q/src/cuda/file.h  |   0
 .../parboil/benchmarks/mri-q/src/cuda/main.cu |   0
 .../benchmarks/mri-q/src/omp_base/Makefile    |   0
 .../benchmarks/mri-q/src/omp_base/computeQ.cc |   0
 .../benchmarks/mri-q/src/omp_base/file.cc     |   0
 .../benchmarks/mri-q/src/omp_base/file.h      |   0
 .../benchmarks/mri-q/src/omp_base/main.c      |   0
 .../benchmarks/mri-q/src/opencl/Makefile      |   0
 .../benchmarks/mri-q/src/opencl/computeQ.c    |   0
 .../benchmarks/mri-q/src/opencl/computeQ.h    |   0
 .../benchmarks/mri-q/src/opencl/file.cc       |   0
 .../benchmarks/mri-q/src/opencl/file.h        |   0
 .../benchmarks/mri-q/src/opencl/kernels.cl    |   0
 .../benchmarks/mri-q/src/opencl/macros.h      |   0
 .../benchmarks/mri-q/src/opencl/main.c        |   0
 .../parboil/benchmarks/mri-q/src/opencl/ocl.c |   0
 .../parboil/benchmarks/mri-q/src/opencl/ocl.h |   0
 .../mri-q/src/opencl_nvidia/Makefile          |   0
 .../mri-q/src/opencl_nvidia/computeQ.c        |   0
 .../mri-q/src/opencl_nvidia/computeQ.h        |   0
 .../mri-q/src/opencl_nvidia/file.cc           |   0
 .../benchmarks/mri-q/src/opencl_nvidia/file.h |   0
 .../mri-q/src/opencl_nvidia/kernels.cl        |   0
 .../mri-q/src/opencl_nvidia/macros.h          |   0
 .../benchmarks/mri-q/src/opencl_nvidia/main.c |   0
 .../benchmarks/mri-q/src/opencl_nvidia/ocl.c  |   0
 .../benchmarks/mri-q/src/opencl_nvidia/ocl.h  |   0
 .../benchmarks/mri-q/src/visc/Makefile        |   0
 .../benchmarks/mri-q/src/visc/macros.h        |   0
 .../benchmarks/mri-q/tools/compare-output     |   0
 .../test/parboil/benchmarks/nodeSwap/Makefile |   0
 .../benchmarks/nodeSwap/src/opencl/Makefile   |   0
 .../benchmarks/nodeSwap/src/opencl/io.cc      |   0
 .../benchmarks/nodeSwap/src/opencl/kernel.cl  |   0
 .../nodeSwap/src/opencl/kernel_offline.cl     |   0
 .../benchmarks/nodeSwap/src/opencl/main.cc    |   0
 .../benchmarks/nodeSwap/tools/compare-output  |   0
 .../parboil/benchmarks/pipeline/DESCRIPTION   |   0
 .../test/parboil/benchmarks/pipeline/Makefile |   0
 .../benchmarks/pipeline/copyToVersions.sh     |   0
 ...radient.visc.merged.experiments.notimer.ll |   0
 ...placian.visc.merged.experiments.notimer.ll |   0
 .../test/parboil/benchmarks/pipeline/run.sh   |   0
 .../parboil/benchmarks/pipeline/runscript.sh  |   0
 .../benchmarks/pipeline/src/Gradient/Makefile |   0
 .../benchmarks/pipeline/src/Gradient/io.cc    |   0
 .../benchmarks/pipeline/src/Gradient/main.cc  |   0
 .../pipeline/src/GradientMerged/Makefile      |   0
 .../pipeline/src/GradientMerged/io.cc         |   0
 .../pipeline/src/GradientMerged/main.cc       |   0
 .../pipeline/src/Laplacian/Makefile           |   0
 .../benchmarks/pipeline/src/Laplacian/io.cc   |   0
 .../benchmarks/pipeline/src/Laplacian/main.cc |   0
 .../pipeline/src/LaplacianMerged/Makefile     |   0
 .../pipeline/src/LaplacianMerged/io.cc        |   0
 .../pipeline/src/LaplacianMerged/main.cc      |   0
 .../benchmarks/pipeline/src/visc/Makefile     |   0
 .../benchmarks/pipeline/src/visc/io.cc        |   0
 .../benchmarks/pipeline/src/visc/kernel.cl    |   0
 .../benchmarks/pipeline/src/visc/main.cc      |   0
 .../benchmarks/pipeline/src/visc/main.cc.pldi |   0
 .../benchmarks/pipeline/src/visc/main_demo.cc |   0
 .../pipeline/src/viscGPU-Scalar-MaxG/Makefile |   0
 .../pipeline/src/viscGPU-Scalar-MaxG/io.cc    |   0
 .../pipeline/src/viscGPU-Scalar-MaxG/main.cc  |   0
 .../pipeline/src/viscGPU-Scalar-ZC/Makefile   |   0
 .../pipeline/src/viscGPU-Scalar-ZC/io.cc      |   0
 .../pipeline/src/viscGPU-Scalar-ZC/main.cc    |   0
 .../benchmarks/pipeline/src/viscGPU/Makefile  |   0
 .../benchmarks/pipeline/src/viscGPU/io.cc     |   0
 .../benchmarks/pipeline/src/viscGPU/main.cc   |   0
 .../pipeline/src/viscScalar/Makefile          |   0
 .../benchmarks/pipeline/src/viscScalar/io.cc  |   0
 .../pipeline/src/viscScalar/main.cc           |   0
 .../src/viscVector-Scalar-MaxG/Makefile       |   0
 .../pipeline/src/viscVector-Scalar-MaxG/io.cc |   0
 .../src/viscVector-Scalar-MaxG/main.cc        |   0
 .../src/viscVector-Scalar-ZC/Makefile         |   0
 .../pipeline/src/viscVector-Scalar-ZC/io.cc   |   0
 .../pipeline/src/viscVector-Scalar-ZC/main.cc |   0
 .../pipeline/src/viscVector/Makefile          |   0
 .../benchmarks/pipeline/src/viscVector/io.cc  |   0
 .../pipeline/src/viscVector/main.cc           |   0
 .../pipeline/src/visc_demo/Makefile           |   0
 .../benchmarks/pipeline/src/visc_demo/io.cc   |   0
 .../benchmarks/pipeline/src/visc_demo/main.cc |   0
 .../pipeline/src/visc_parallel/Makefile       |   0
 .../pipeline/src/visc_parallel/io.cc          |   0
 .../pipeline/src/visc_parallel/main.cc        |   0
 .../benchmarks/pipeline/tools/compare-output  |   0
 .../test/parboil/benchmarks/sad/DESCRIPTION   |   0
 .../test/parboil/benchmarks/sad/Makefile      |   0
 .../parboil/benchmarks/sad/src/base/Makefile  |   0
 .../parboil/benchmarks/sad/src/base/file.c    |   0
 .../parboil/benchmarks/sad/src/base/file.h    |   0
 .../parboil/benchmarks/sad/src/base/image.c   |   0
 .../parboil/benchmarks/sad/src/base/image.h   |   0
 .../parboil/benchmarks/sad/src/base/main.c    |   0
 .../parboil/benchmarks/sad/src/base/sad.h     |   0
 .../parboil/benchmarks/sad/src/base/sad_cpu.c |   0
 .../parboil/benchmarks/sad/src/cpu/Makefile   |   0
 .../parboil/benchmarks/sad/src/cpu/file.c     |   0
 .../parboil/benchmarks/sad/src/cpu/file.h     |   0
 .../parboil/benchmarks/sad/src/cpu/image.c    |   0
 .../parboil/benchmarks/sad/src/cpu/image.h    |   0
 .../parboil/benchmarks/sad/src/cpu/main.c     |   0
 .../test/parboil/benchmarks/sad/src/cpu/sad.h |   0
 .../parboil/benchmarks/sad/src/cpu/sad_cpu.c  |   0
 .../parboil/benchmarks/sad/src/cuda/Makefile  |   0
 .../parboil/benchmarks/sad/src/cuda/file.c    |   0
 .../parboil/benchmarks/sad/src/cuda/file.h    |   0
 .../parboil/benchmarks/sad/src/cuda/image.c   |   0
 .../parboil/benchmarks/sad/src/cuda/image.h   |   0
 .../benchmarks/sad/src/cuda/largerBlocks.cu   |   0
 .../benchmarks/sad/src/cuda/largerBlocks.h    |   0
 .../parboil/benchmarks/sad/src/cuda/main.cu   |   0
 .../parboil/benchmarks/sad/src/cuda/sad.h     |   0
 .../parboil/benchmarks/sad/src/cuda/sad4.cu   |   0
 .../parboil/benchmarks/sad/src/cuda/sad4.h    |   0
 .../benchmarks/sad/src/cuda_base/Makefile     |   0
 .../benchmarks/sad/src/cuda_base/file.c       |   0
 .../benchmarks/sad/src/cuda_base/file.h       |   0
 .../benchmarks/sad/src/cuda_base/image.c      |   0
 .../benchmarks/sad/src/cuda_base/image.h      |   0
 .../sad/src/cuda_base/largerBlocks.cu         |   0
 .../sad/src/cuda_base/largerBlocks.h          |   0
 .../benchmarks/sad/src/cuda_base/main.cu      |   0
 .../benchmarks/sad/src/cuda_base/sad.h        |   0
 .../benchmarks/sad/src/cuda_base/sad4.cu      |   0
 .../benchmarks/sad/src/cuda_base/sad4.h       |   0
 .../benchmarks/sad/src/opencl_base/Makefile   |   0
 .../sad/src/opencl_base/OpenCL_common.cpp     |   0
 .../sad/src/opencl_base/OpenCL_common.h       |   0
 .../benchmarks/sad/src/opencl_base/file.c     |   0
 .../benchmarks/sad/src/opencl_base/file.h     |   0
 .../benchmarks/sad/src/opencl_base/image.c    |   0
 .../benchmarks/sad/src/opencl_base/image.h    |   0
 .../benchmarks/sad/src/opencl_base/main.cpp   |   0
 .../benchmarks/sad/src/opencl_base/sad.h      |   0
 .../sad/src/opencl_base/sad_kernel.cl         |   0
 .../sad/src/opencl_base/sad_kernel.h          |   0
 .../benchmarks/sad/src/opencl_nvidia/Makefile |   0
 .../sad/src/opencl_nvidia/OpenCL_common.cpp   |   0
 .../sad/src/opencl_nvidia/OpenCL_common.h     |   0
 .../benchmarks/sad/src/opencl_nvidia/file.c   |   0
 .../benchmarks/sad/src/opencl_nvidia/file.h   |   0
 .../benchmarks/sad/src/opencl_nvidia/image.c  |   0
 .../benchmarks/sad/src/opencl_nvidia/image.h  |   0
 .../benchmarks/sad/src/opencl_nvidia/main.cpp |   0
 .../sad/src/opencl_nvidia/main_debug.cpp      |   0
 .../benchmarks/sad/src/opencl_nvidia/sad.h    |   0
 .../sad/src/opencl_nvidia/sad_kernel.cl       |   0
 .../sad/src/opencl_nvidia/sad_kernel.h        |   0
 .../parboil/benchmarks/sad/src/visc/Makefile  |   0
 .../parboil/benchmarks/sad/src/visc/file.c    |   0
 .../parboil/benchmarks/sad/src/visc/file.h    |   0
 .../parboil/benchmarks/sad/src/visc/image.c   |   0
 .../parboil/benchmarks/sad/src/visc/image.h   |   0
 .../parboil/benchmarks/sad/src/visc/main.cpp  |   0
 .../parboil/benchmarks/sad/src/visc/sad.h     |   0
 .../benchmarks/sad/src/visc/sad_kernel.cl     |   0
 .../benchmarks/sad/src/visc/sad_kernel.h      |   0
 .../benchmarks/sad/tools/compare-output       |   0
 .../benchmarks/sad/tools/compute-one-sad.py   |   0
 .../parboil/benchmarks/saxpy_test/Makefile    |   0
 .../parboil/benchmarks/saxpy_test/src/defs.h  |   0
 .../parboil/benchmarks/saxpy_test/src/main.c  |   0
 .../parboil/benchmarks/saxpy_test/src/visc.h  |   0
 .../test/parboil/benchmarks/sgemm/DESCRIPTION |   0
 .../test/parboil/benchmarks/sgemm/Makefile    |   0
 .../benchmarks/sgemm/src/base/Makefile        |   0
 .../parboil/benchmarks/sgemm/src/base/io.cc   |   0
 .../parboil/benchmarks/sgemm/src/base/main.cc |   0
 .../benchmarks/sgemm/src/base/sgemm_kernel.cc |   0
 .../benchmarks/sgemm/src/cuda/Makefile        |   0
 .../parboil/benchmarks/sgemm/src/cuda/io.cc   |   0
 .../parboil/benchmarks/sgemm/src/cuda/main.cu |   0
 .../benchmarks/sgemm/src/cuda/sgemm_kernel.cu |   0
 .../benchmarks/sgemm/src/cuda_base/Makefile   |   0
 .../benchmarks/sgemm/src/cuda_base/io.cc      |   0
 .../benchmarks/sgemm/src/cuda_base/main.cu    |   0
 .../sgemm/src/cuda_base/sgemm_kernel.cu       |   0
 .../benchmarks/sgemm/src/omp_base/Makefile    |   0
 .../benchmarks/sgemm/src/omp_base/io.cc       |   0
 .../benchmarks/sgemm/src/omp_base/main.cc     |   0
 .../sgemm/src/omp_base/sgemm_kernel.cc        |   0
 .../benchmarks/sgemm/src/opencl_base/Makefile |   0
 .../benchmarks/sgemm/src/opencl_base/io.cc    |   0
 .../sgemm/src/opencl_base/kernel.cl           |   0
 .../sgemm/src/opencl_base/kernel_offline.cl   |   0
 .../benchmarks/sgemm/src/opencl_base/main.cc  |   0
 .../sgemm/src/opencl_base_opt/Makefile        |   0
 .../sgemm/src/opencl_base_opt/io.cc           |   0
 .../sgemm/src/opencl_base_opt/kernel.cl       |   0
 .../sgemm/src/opencl_base_opt/main.cc         |   0
 .../sgemm/src/opencl_base_vec/Makefile        |   0
 .../sgemm/src/opencl_base_vec/io.cc           |   0
 .../sgemm/src/opencl_base_vec/kernel.cl       |   0
 .../src/opencl_base_vec/kernel_offline.cl     |   0
 .../sgemm/src/opencl_base_vec/main.cc         |   0
 .../benchmarks/sgemm/src/opencl_cpu/Makefile  |   0
 .../benchmarks/sgemm/src/opencl_cpu/io.cc     |   0
 .../benchmarks/sgemm/src/opencl_cpu/kernel.cl |   0
 .../sgemm/src/opencl_cpu/kernel_offline.cl    |   0
 .../benchmarks/sgemm/src/opencl_cpu/main.cc   |   0
 .../sgemm/src/opencl_cpu_4K/Makefile          |   0
 .../benchmarks/sgemm/src/opencl_cpu_4K/io.cc  |   0
 .../sgemm/src/opencl_cpu_4K/kernel.cl         |   0
 .../sgemm/src/opencl_cpu_4K/kernel.ir         | Bin
 .../sgemm/src/opencl_cpu_4K/kernel.ll         |   0
 .../sgemm/src/opencl_cpu_4K/kernel_offline.cl |   0
 .../sgemm/src/opencl_cpu_4K/main.cc           |   0
 .../sgemm/src/opencl_cpu_baseline/Makefile    |   0
 .../sgemm/src/opencl_cpu_baseline/io.cc       |   0
 .../sgemm/src/opencl_cpu_baseline/kernel.cl   |   0
 .../src/opencl_cpu_baseline/kernel_offline.cl |   0
 .../sgemm/src/opencl_cpu_baseline/main.cc     |   0
 .../sgemm/src/opencl_cpu_medium/Makefile      |   0
 .../sgemm/src/opencl_cpu_medium/io.cc         |   0
 .../sgemm/src/opencl_cpu_medium/kernel.cl     |   0
 .../sgemm/src/opencl_cpu_medium/kernel.ir     | Bin
 .../sgemm/src/opencl_cpu_medium/kernel.ll     |   0
 .../src/opencl_cpu_medium/kernel_offline.cl   |   0
 .../sgemm/src/opencl_cpu_medium/main.cc       |   0
 .../sgemm/src/opencl_cpu_sm/Makefile          |   0
 .../benchmarks/sgemm/src/opencl_cpu_sm/io.cc  |   0
 .../sgemm/src/opencl_cpu_sm/kernel-spir64.ll  |   0
 .../sgemm/src/opencl_cpu_sm/kernel.cl         |   0
 .../sgemm/src/opencl_cpu_sm/kernel.ll         |   0
 .../sgemm/src/opencl_cpu_sm/main.cc           |   0
 .../sgemm/src/opencl_cpu_sm/test-spir64.ll    |   0
 .../sgemm/src/opencl_cpu_sm/test.cl           |   0
 .../sgemm/src/opencl_cpu_sm/test.ll           |   0
 .../sgemm/src/opencl_nvidia/Makefile          |   0
 .../benchmarks/sgemm/src/opencl_nvidia/io.cc  |   0
 .../sgemm/src/opencl_nvidia/kernel.cl         |   0
 .../sgemm/src/opencl_nvidia/main.cc           |   0
 .../sgemm/src/opencl_opt_8/Makefile           |   0
 .../benchmarks/sgemm/src/opencl_opt_8/io.cc   |   0
 .../sgemm/src/opencl_opt_8/kernel.cl          |   0
 .../benchmarks/sgemm/src/opencl_opt_8/main.cc |   0
 .../sgemm/src/opencl_opt_8_4K/Makefile        |   0
 .../sgemm/src/opencl_opt_8_4K/io.cc           |   0
 .../sgemm/src/opencl_opt_8_4K/kernel.cl       |   0
 .../sgemm/src/opencl_opt_8_4K/main.cc         |   0
 .../sgemm/src/opencl_opt_8_medium/Makefile    |   0
 .../sgemm/src/opencl_opt_8_medium/io.cc       |   0
 .../sgemm/src/opencl_opt_8_medium/kernel.cl   |   0
 .../sgemm/src/opencl_opt_8_medium/main.cc     |   0
 .../sgemm/src/opencl_opt_8_vec/Makefile       |   0
 .../sgemm/src/opencl_opt_8_vec/io.cc          |   0
 .../sgemm/src/opencl_opt_8_vec/kernel.cl      |   0
 .../sgemm/src/opencl_opt_8_vec/main.cc        |   0
 .../benchmarks/sgemm/src/visc/Makefile        |   0
 .../parboil/benchmarks/sgemm/src/visc/io.cc   |   0
 .../benchmarks/sgemm/src/visc/kernel.cl       |   0
 .../parboil/benchmarks/sgemm/src/visc/main.cc |   0
 .../benchmarks/sgemm/src/visc_opt/Makefile    |   0
 .../benchmarks/sgemm/src/visc_opt/io.cc       |   0
 .../benchmarks/sgemm/src/visc_opt/kernel.cl   |   0
 .../benchmarks/sgemm/src/visc_opt/main.cc     |   0
 .../benchmarks/sgemm/src/visc_sh/Makefile     |   0
 .../benchmarks/sgemm/src/visc_sh/io.cc        |   0
 .../benchmarks/sgemm/src/visc_sh/main.cc      |   0
 .../benchmarks/sgemm/src/visc_tc/Makefile     |   0
 .../benchmarks/sgemm/src/visc_tc/io.cc        |   0
 .../benchmarks/sgemm/src/visc_tc/main.cc      |   0
 .../benchmarks/sgemm/src/visc_tc_vec/Makefile |   0
 .../benchmarks/sgemm/src/visc_tc_vec/io.cc    |   0
 .../benchmarks/sgemm/src/visc_tc_vec/main.cc  |   0
 .../sgemm/src/visc_tc_vec/main.visc.ll        |   0
 .../benchmarks/sgemm/src/visc_vec/Makefile    |   0
 .../benchmarks/sgemm/src/visc_vec/io.cc       |   0
 .../benchmarks/sgemm/src/visc_vec/kernel.cl   |   0
 .../benchmarks/sgemm/src/visc_vec/main.cc     |   0
 .../sgemm/src/visc_vec/main.visc.ll           |   0
 .../sgemm/src/visc_vec_opt/Makefile           |   0
 .../benchmarks/sgemm/src/visc_vec_opt/io.cc   |   0
 .../sgemm/src/visc_vec_opt/kernel.cl          |   0
 .../benchmarks/sgemm/src/visc_vec_opt/main.cc |   0
 .../sgemm/src/visc_vec_opt/main.visc.ll       |   0
 .../benchmarks/sgemm/tools/compare-output     |   0
 .../test/parboil/benchmarks/spmv/DESCRIPTION  |   0
 .../test/parboil/benchmarks/spmv/Makefile     |   0
 .../spmv/common_src/convert-dataset/Makefile  |   0
 .../common_src/convert-dataset/bcsstk32.mtx   |   0
 .../common_src/convert-dataset/commontools.mk |   0
 .../convert-dataset/convert_dataset.c         |   0
 .../convert-dataset/convert_dataset.h         |   0
 .../common_src/convert-dataset/fidapm05.mtx   |   0
 .../convert-dataset/fidapm05_rhs1.mtx         |   0
 .../common_src/convert-dataset/jgl009.mtx     |   0
 .../spmv/common_src/convert-dataset/mmio.c    |   0
 .../spmv/common_src/convert-dataset/mmio.h    |   0
 .../spmv/common_src/convert-dataset/test.c    |   0
 .../parboil/benchmarks/spmv/src/cpu/Makefile  |   0
 .../parboil/benchmarks/spmv/src/cpu/file.c    |   0
 .../parboil/benchmarks/spmv/src/cpu/file.h    |   0
 .../parboil/benchmarks/spmv/src/cpu/main.c    |   0
 .../parboil/benchmarks/spmv/src/cuda/Makefile |   0
 .../parboil/benchmarks/spmv/src/cuda/file.cc  |   0
 .../parboil/benchmarks/spmv/src/cuda/file.h   |   0
 .../benchmarks/spmv/src/cuda/gpu_info.cc      |   0
 .../benchmarks/spmv/src/cuda/gpu_info.h       |   0
 .../benchmarks/spmv/src/cuda/jds_kernels.cu   |   0
 .../parboil/benchmarks/spmv/src/cuda/main.cu  |   0
 .../benchmarks/spmv/src/cuda/spmv_jds.h       |   0
 .../benchmarks/spmv/src/cuda_base/Makefile    |   0
 .../benchmarks/spmv/src/cuda_base/file.cc     |   0
 .../benchmarks/spmv/src/cuda_base/file.h      |   0
 .../benchmarks/spmv/src/cuda_base/gpu_info.cc |   0
 .../benchmarks/spmv/src/cuda_base/gpu_info.h  |   0
 .../spmv/src/cuda_base/jds_kernels.cu         |   0
 .../benchmarks/spmv/src/cuda_base/main.cu     |   0
 .../benchmarks/spmv/src/cuda_base/spmv_jds.h  |   0
 .../spmv/src/cuda_base_tex/Makefile           |   0
 .../benchmarks/spmv/src/cuda_base_tex/file.cc |   0
 .../benchmarks/spmv/src/cuda_base_tex/file.h  |   0
 .../spmv/src/cuda_base_tex/gpu_info.cc        |   0
 .../spmv/src/cuda_base_tex/gpu_info.h         |   0
 .../spmv/src/cuda_base_tex/jds_kernels.cu     |   0
 .../benchmarks/spmv/src/cuda_base_tex/main.cu |   0
 .../spmv/src/cuda_base_tex/spmv_jds.h         |   0
 .../benchmarks/spmv/src/cuda_tex/Makefile     |   0
 .../benchmarks/spmv/src/cuda_tex/file.cc      |   0
 .../benchmarks/spmv/src/cuda_tex/file.h       |   0
 .../benchmarks/spmv/src/cuda_tex/gpu_info.cc  |   0
 .../benchmarks/spmv/src/cuda_tex/gpu_info.h   |   0
 .../spmv/src/cuda_tex/jds_kernels.cu          |   0
 .../benchmarks/spmv/src/cuda_tex/main.cu      |   0
 .../benchmarks/spmv/src/cuda_tex/spmv_jds.h   |   0
 .../benchmarks/spmv/src/omp_base/Makefile     |   0
 .../benchmarks/spmv/src/omp_base/file.c       |   0
 .../benchmarks/spmv/src/omp_base/file.h       |   0
 .../benchmarks/spmv/src/omp_base/main.c       |   0
 .../benchmarks/spmv/src/opencl_ati/Makefile   |   0
 .../benchmarks/spmv/src/opencl_ati/file.c     |   0
 .../benchmarks/spmv/src/opencl_ati/file.h     |   0
 .../benchmarks/spmv/src/opencl_ati/gpu_info.c |   0
 .../benchmarks/spmv/src/opencl_ati/gpu_info.h |   0
 .../benchmarks/spmv/src/opencl_ati/kernel.cl  |   0
 .../benchmarks/spmv/src/opencl_ati/main.c     |   0
 .../benchmarks/spmv/src/opencl_ati/ocl.c      |   0
 .../benchmarks/spmv/src/opencl_ati/ocl.h      |   0
 .../benchmarks/spmv/src/opencl_ati/readme.txt |   0
 .../spmv/src/opencl_ati_vec/Makefile          |   0
 .../benchmarks/spmv/src/opencl_ati_vec/file.c |   0
 .../benchmarks/spmv/src/opencl_ati_vec/file.h |   0
 .../spmv/src/opencl_ati_vec/gpu_info.c        |   0
 .../spmv/src/opencl_ati_vec/gpu_info.h        |   0
 .../spmv/src/opencl_ati_vec/kernel.cl         |   0
 .../benchmarks/spmv/src/opencl_ati_vec/main.c |   0
 .../benchmarks/spmv/src/opencl_ati_vec/ocl.c  |   0
 .../benchmarks/spmv/src/opencl_ati_vec/ocl.h  |   0
 .../spmv/src/opencl_ati_vec/readme.txt        |   0
 .../benchmarks/spmv/src/opencl_base/Makefile  |   0
 .../benchmarks/spmv/src/opencl_base/file.c    |   0
 .../benchmarks/spmv/src/opencl_base/file.h    |   0
 .../spmv/src/opencl_base/gpu_info.c           |   0
 .../spmv/src/opencl_base/gpu_info.h           |   0
 .../benchmarks/spmv/src/opencl_base/kernel.cl |   0
 .../benchmarks/spmv/src/opencl_base/main.c    |   0
 .../benchmarks/spmv/src/opencl_base/ocl.c     |   0
 .../benchmarks/spmv/src/opencl_base/ocl.h     |   0
 .../benchmarks/spmv/src/opencl_cpu/Makefile   |   0
 .../benchmarks/spmv/src/opencl_cpu/file.c     |   0
 .../benchmarks/spmv/src/opencl_cpu/file.h     |   0
 .../benchmarks/spmv/src/opencl_cpu/gpu_info.c |   0
 .../benchmarks/spmv/src/opencl_cpu/gpu_info.h |   0
 .../benchmarks/spmv/src/opencl_cpu/kernel.cl  |   0
 .../benchmarks/spmv/src/opencl_cpu/main.c     |   0
 .../benchmarks/spmv/src/opencl_cpu/ocl.c      |   0
 .../benchmarks/spmv/src/opencl_cpu/ocl.h      |   0
 .../spmv/src/opencl_cpu_baseline/Makefile     |   0
 .../spmv/src/opencl_cpu_baseline/file.c       |   0
 .../spmv/src/opencl_cpu_baseline/file.h       |   0
 .../spmv/src/opencl_cpu_baseline/gpu_info.c   |   0
 .../spmv/src/opencl_cpu_baseline/gpu_info.h   |   0
 .../spmv/src/opencl_cpu_baseline/kernel.cl    |   0
 .../spmv/src/opencl_cpu_baseline/main.c       |   0
 .../spmv/src/opencl_cpu_baseline/ocl.c        |   0
 .../spmv/src/opencl_cpu_baseline/ocl.h        |   0
 .../spmv/src/opencl_cpu_huge/Makefile         |   0
 .../spmv/src/opencl_cpu_huge/file.c           |   0
 .../spmv/src/opencl_cpu_huge/file.h           |   0
 .../spmv/src/opencl_cpu_huge/gpu_info.c       |   0
 .../spmv/src/opencl_cpu_huge/gpu_info.h       |   0
 .../spmv/src/opencl_cpu_huge/kernel.cl        |   0
 .../spmv/src/opencl_cpu_huge/kernel.ir        | Bin
 .../spmv/src/opencl_cpu_huge/main.c           |   0
 .../benchmarks/spmv/src/opencl_cpu_huge/ocl.c |   0
 .../benchmarks/spmv/src/opencl_cpu_huge/ocl.h |   0
 .../spmv/src/opencl_cpu_large/Makefile        |   0
 .../spmv/src/opencl_cpu_large/file.c          |   0
 .../spmv/src/opencl_cpu_large/file.h          |   0
 .../spmv/src/opencl_cpu_large/gpu_info.c      |   0
 .../spmv/src/opencl_cpu_large/gpu_info.h      |   0
 .../spmv/src/opencl_cpu_large/kernel.cl       |   0
 .../spmv/src/opencl_cpu_large/kernel.ir       | Bin
 .../spmv/src/opencl_cpu_large/main.c          |   0
 .../spmv/src/opencl_cpu_large/ocl.c           |   0
 .../spmv/src/opencl_cpu_large/ocl.h           |   0
 .../spmv/src/opencl_nvidia/Makefile           |   0
 .../benchmarks/spmv/src/opencl_nvidia/file.c  |   0
 .../benchmarks/spmv/src/opencl_nvidia/file.h  |   0
 .../spmv/src/opencl_nvidia/gpu_info.c         |   0
 .../spmv/src/opencl_nvidia/gpu_info.h         |   0
 .../spmv/src/opencl_nvidia/kernel.cl          |   0
 .../spmv/src/opencl_nvidia/kernel_offline.cl  |   0
 .../benchmarks/spmv/src/opencl_nvidia/main.c  |   0
 .../benchmarks/spmv/src/opencl_nvidia/ocl.c   |   0
 .../benchmarks/spmv/src/opencl_nvidia/ocl.h   |   0
 .../spmv/src/opencl_nvidia_huge/Makefile      |   0
 .../spmv/src/opencl_nvidia_huge/file.c        |   0
 .../spmv/src/opencl_nvidia_huge/file.h        |   0
 .../spmv/src/opencl_nvidia_huge/gpu_info.c    |   0
 .../spmv/src/opencl_nvidia_huge/gpu_info.h    |   0
 .../spmv/src/opencl_nvidia_huge/kernel.cl     |   0
 .../src/opencl_nvidia_huge/kernel_offline.cl  |   0
 .../spmv/src/opencl_nvidia_huge/main.c        |   0
 .../spmv/src/opencl_nvidia_huge/ocl.c         |   0
 .../spmv/src/opencl_nvidia_huge/ocl.h         |   0
 .../spmv/src/opencl_nvidia_large/Makefile     |   0
 .../spmv/src/opencl_nvidia_large/file.c       |   0
 .../spmv/src/opencl_nvidia_large/file.h       |   0
 .../spmv/src/opencl_nvidia_large/gpu_info.c   |   0
 .../spmv/src/opencl_nvidia_large/gpu_info.h   |   0
 .../spmv/src/opencl_nvidia_large/kernel.cl    |   0
 .../src/opencl_nvidia_large/kernel_offline.cl |   0
 .../spmv/src/opencl_nvidia_large/main.c       |   0
 .../spmv/src/opencl_nvidia_large/ocl.c        |   0
 .../spmv/src/opencl_nvidia_large/ocl.h        |   0
 .../benchmarks/spmv/src/opencl_tex/Makefile   |   0
 .../benchmarks/spmv/src/opencl_tex/file.c     |   0
 .../benchmarks/spmv/src/opencl_tex/file.h     |   0
 .../benchmarks/spmv/src/opencl_tex/gpu_info.c |   0
 .../benchmarks/spmv/src/opencl_tex/gpu_info.h |   0
 .../benchmarks/spmv/src/opencl_tex/kernel.cl  |   0
 .../benchmarks/spmv/src/opencl_tex/main.c     |   0
 .../benchmarks/spmv/src/opencl_tex/ocl.c      |   0
 .../benchmarks/spmv/src/opencl_tex/ocl.h      |   0
 .../spmv/src/opencl_tex_nvidia/Makefile       |   0
 .../spmv/src/opencl_tex_nvidia/file.c         |   0
 .../spmv/src/opencl_tex_nvidia/file.h         |   0
 .../spmv/src/opencl_tex_nvidia/gpu_info.c     |   0
 .../spmv/src/opencl_tex_nvidia/gpu_info.h     |   0
 .../spmv/src/opencl_tex_nvidia/kernel.cl      |   0
 .../spmv/src/opencl_tex_nvidia/main.c         |   0
 .../spmv/src/opencl_tex_nvidia/ocl.c          |   0
 .../spmv/src/opencl_tex_nvidia/ocl.h          |   0
 .../opencl_tex_nvidia/opencl_base/Makefile    |   0
 .../src/opencl_tex_nvidia/opencl_base/file.cc |   0
 .../src/opencl_tex_nvidia/opencl_base/file.h  |   0
 .../opencl_tex_nvidia/opencl_base/gpu_info.c  |   0
 .../opencl_tex_nvidia/opencl_base/gpu_info.h  |   0
 .../opencl_tex_nvidia/opencl_base/kernel.cl   |   0
 .../src/opencl_tex_nvidia/opencl_base/main.c  |   0
 .../src/opencl_tex_nvidia/opencl_base/ocl.c   |   0
 .../src/opencl_tex_nvidia/opencl_base/ocl.h   |   0
 .../opencl_tex_nvidia/opencl_nvidia/Makefile  |   0
 .../opencl_tex_nvidia/opencl_nvidia/file.cc   |   0
 .../opencl_tex_nvidia/opencl_nvidia/file.h    |   0
 .../opencl_nvidia/gpu_info.c                  |   0
 .../opencl_nvidia/gpu_info.h                  |   0
 .../opencl_tex_nvidia/opencl_nvidia/kernel.cl |   0
 .../opencl_tex_nvidia/opencl_nvidia/main.c    |   0
 .../src/opencl_tex_nvidia/opencl_nvidia/ocl.c |   0
 .../src/opencl_tex_nvidia/opencl_nvidia/ocl.h |   0
 .../src/opencl_tex_nvidia/opencl_tex/Makefile |   0
 .../src/opencl_tex_nvidia/opencl_tex/file.cc  |   0
 .../src/opencl_tex_nvidia/opencl_tex/file.h   |   0
 .../opencl_tex_nvidia/opencl_tex/gpu_info.c   |   0
 .../opencl_tex_nvidia/opencl_tex/gpu_info.h   |   0
 .../opencl_tex_nvidia/opencl_tex/kernel.cl    |   0
 .../src/opencl_tex_nvidia/opencl_tex/main.c   |   0
 .../src/opencl_tex_nvidia/opencl_tex/ocl.c    |   0
 .../src/opencl_tex_nvidia/opencl_tex/ocl.h    |   0
 .../parboil/benchmarks/spmv/src/visc/Makefile |   0
 .../parboil/benchmarks/spmv/src/visc/file.cpp |   0
 .../parboil/benchmarks/spmv/src/visc/file.h   |   0
 .../benchmarks/spmv/src/visc/gpu_info.cpp     |   0
 .../benchmarks/spmv/src/visc/gpu_info.h       |   0
 .../benchmarks/spmv/src/visc/kernel.cl        |   0
 .../parboil/benchmarks/spmv/src/visc/main.cpp |   0
 .../spmv/src/visc/main.visc.ll.kernels.bc     | Bin
 .../spmv/src/visc/main.visc.ll.kernels.ll     |   0
 .../benchmarks/spmv/tools/compare-output      |   0
 .../benchmarks/spmv/vectorgen/vectorgen.cc    |   0
 .../parboil/benchmarks/stencil/DESCRIPTION    |   0
 .../test/parboil/benchmarks/stencil/Makefile  |   0
 .../benchmarks/stencil/src/cpu/Makefile       |   0
 .../benchmarks/stencil/src/cpu/common.h       |   0
 .../parboil/benchmarks/stencil/src/cpu/file.c |   0
 .../parboil/benchmarks/stencil/src/cpu/file.h |   0
 .../benchmarks/stencil/src/cpu/kernels.c      |   0
 .../benchmarks/stencil/src/cpu/kernels.h      |   0
 .../parboil/benchmarks/stencil/src/cpu/main.c |   0
 .../benchmarks/stencil/src/cuda/Makefile      |   0
 .../benchmarks/stencil/src/cuda/common.h      |   0
 .../benchmarks/stencil/src/cuda/cuerr.h       |   0
 .../benchmarks/stencil/src/cuda/file.cc       |   0
 .../benchmarks/stencil/src/cuda/file.h        |   0
 .../benchmarks/stencil/src/cuda/kernels.cu    |   0
 .../benchmarks/stencil/src/cuda/kernels.h     |   0
 .../benchmarks/stencil/src/cuda/main.cu       |   0
 .../benchmarks/stencil/src/cuda_base/Makefile |   0
 .../benchmarks/stencil/src/cuda_base/common.h |   0
 .../benchmarks/stencil/src/cuda_base/cuerr.h  |   0
 .../benchmarks/stencil/src/cuda_base/file.cc  |   0
 .../benchmarks/stencil/src/cuda_base/file.h   |   0
 .../stencil/src/cuda_base/kernels.cu          |   0
 .../benchmarks/stencil/src/cuda_base/main.cu  |   0
 .../stencil/src/cuda_fermi/Makefile           |   0
 .../stencil/src/cuda_fermi/common.h           |   0
 .../benchmarks/stencil/src/cuda_fermi/cuerr.h |   0
 .../benchmarks/stencil/src/cuda_fermi/file.cc |   0
 .../benchmarks/stencil/src/cuda_fermi/file.h  |   0
 .../stencil/src/cuda_fermi/kernels.cu         |   0
 .../benchmarks/stencil/src/cuda_fermi/main.cu |   0
 .../benchmarks/stencil/src/omp_base/Makefile  |   0
 .../benchmarks/stencil/src/omp_base/common.h  |   0
 .../benchmarks/stencil/src/omp_base/file.c    |   0
 .../benchmarks/stencil/src/omp_base/file.h    |   0
 .../benchmarks/stencil/src/omp_base/kernels.c |   0
 .../benchmarks/stencil/src/omp_base/kernels.h |   0
 .../benchmarks/stencil/src/omp_base/main.c    |   0
 .../stencil/src/opencl_base/Makefile          |   0
 .../stencil/src/opencl_base/common.h          |   0
 .../stencil/src/opencl_base/file.cc           |   0
 .../benchmarks/stencil/src/opencl_base/file.h |   0
 .../stencil/src/opencl_base/kernel.cl         |   0
 .../stencil/src/opencl_base/kernel_offline.cl |   0
 .../benchmarks/stencil/src/opencl_base/main.c |   0
 .../stencil/src/opencl_base_default/Makefile  |   0
 .../stencil/src/opencl_base_default/common.h  |   0
 .../stencil/src/opencl_base_default/file.cc   |   0
 .../stencil/src/opencl_base_default/file.h    |   0
 .../stencil/src/opencl_base_default/kernel.cl |   0
 .../src/opencl_base_default/kernel_offline.cl |   0
 .../stencil/src/opencl_base_default/main.c    |   0
 .../stencil/src/opencl_base_large/Makefile    |   0
 .../stencil/src/opencl_base_large/common.h    |   0
 .../stencil/src/opencl_base_large/file.cc     |   0
 .../stencil/src/opencl_base_large/file.h      |   0
 .../stencil/src/opencl_base_large/kernel.cl   |   0
 .../src/opencl_base_large/kernel_offline.cl   |   0
 .../stencil/src/opencl_base_large/main.c      |   0
 .../stencil/src/opencl_base_opt/Makefile      |   0
 .../stencil/src/opencl_base_opt/common.h      |   0
 .../stencil/src/opencl_base_opt/file.cc       |   0
 .../stencil/src/opencl_base_opt/file.h        |   0
 .../stencil/src/opencl_base_opt/kernel.cl     |   0
 .../stencil/src/opencl_base_opt/main.c        |   0
 .../stencil/src/opencl_base_strided/Makefile  |   0
 .../stencil/src/opencl_base_strided/common.h  |   0
 .../stencil/src/opencl_base_strided/file.cc   |   0
 .../stencil/src/opencl_base_strided/file.h    |   0
 .../stencil/src/opencl_base_strided/kernel.cl |   0
 .../src/opencl_base_strided/kernel_offline.cl |   0
 .../stencil/src/opencl_base_strided/main.c    |   0
 .../stencil/src/opencl_base_vec/Makefile      |   0
 .../stencil/src/opencl_base_vec/common.h      |   0
 .../stencil/src/opencl_base_vec/file.cc       |   0
 .../stencil/src/opencl_base_vec/file.h        |   0
 .../stencil/src/opencl_base_vec/kernel.cl     |   0
 .../src/opencl_base_vec/kernel_offline.cl     |   0
 .../stencil/src/opencl_base_vec/main.c        |   0
 .../stencil/src/opencl_cpu/Makefile           |   0
 .../stencil/src/opencl_cpu/common.h           |   0
 .../benchmarks/stencil/src/opencl_cpu/file.cc |   0
 .../benchmarks/stencil/src/opencl_cpu/file.h  |   0
 .../stencil/src/opencl_cpu/kernel.cl          |   0
 .../stencil/src/opencl_cpu/kernel_offline.cl  |   0
 .../benchmarks/stencil/src/opencl_cpu/main.c  |   0
 .../stencil/src/opencl_cpu_baseline/Makefile  |   0
 .../stencil/src/opencl_cpu_baseline/common.h  |   0
 .../stencil/src/opencl_cpu_baseline/file.cc   |   0
 .../stencil/src/opencl_cpu_baseline/file.h    |   0
 .../stencil/src/opencl_cpu_baseline/kernel.cl |   0
 .../src/opencl_cpu_baseline/kernel_offline.cl |   0
 .../stencil/src/opencl_cpu_baseline/main.c    |   0
 .../stencil/src/opencl_cpu_default/Makefile   |   0
 .../stencil/src/opencl_cpu_default/common.h   |   0
 .../stencil/src/opencl_cpu_default/file.cc    |   0
 .../stencil/src/opencl_cpu_default/file.h     |   0
 .../src/opencl_cpu_default/kernel-spir64.bc   | Bin
 .../src/opencl_cpu_default/kernel-spir64.ll   |   0
 .../stencil/src/opencl_cpu_default/kernel.cl  |   0
 .../stencil/src/opencl_cpu_default/kernel.ir  | Bin
 .../src/opencl_cpu_default/kernel_offline.cl  |   0
 .../stencil/src/opencl_cpu_default/main.c     |   0
 .../stencil/src/opencl_cpu_large/Makefile     |   0
 .../stencil/src/opencl_cpu_large/common.h     |   0
 .../stencil/src/opencl_cpu_large/file.cc      |   0
 .../stencil/src/opencl_cpu_large/file.h       |   0
 .../src/opencl_cpu_large/kernel-spir64.bc     | Bin
 .../src/opencl_cpu_large/kernel-spir64.ll     |   0
 .../stencil/src/opencl_cpu_large/kernel.cl    |   0
 .../stencil/src/opencl_cpu_large/kernel.ir    | Bin
 .../src/opencl_cpu_large/kernel_offline.cl    |   0
 .../stencil/src/opencl_cpu_large/main.c       |   0
 .../stencil/src/opencl_fermi/Makefile         |   0
 .../stencil/src/opencl_fermi/common.h         |   0
 .../stencil/src/opencl_fermi/file.cc          |   0
 .../stencil/src/opencl_fermi/file.h           |   0
 .../stencil/src/opencl_fermi/kernel.cl        |   0
 .../stencil/src/opencl_fermi/main.c           |   0
 .../stencil/src/opencl_nvidia/Makefile        |   0
 .../stencil/src/opencl_nvidia/common.h        |   0
 .../stencil/src/opencl_nvidia/file.cc         |   0
 .../stencil/src/opencl_nvidia/file.h          |   0
 .../stencil/src/opencl_nvidia/kernel.cl       |   0
 .../stencil/src/opencl_nvidia/main.c          |   0
 .../benchmarks/stencil/src/visc/Makefile      |   0
 .../benchmarks/stencil/src/visc/common.h      |   0
 .../benchmarks/stencil/src/visc/file.cc       |   0
 .../benchmarks/stencil/src/visc/file.h        |   0
 .../benchmarks/stencil/src/visc/kernel.cl     |   0
 .../benchmarks/stencil/src/visc/stencil.cpp   |   0
 .../benchmarks/stencil/src/visc_vec/common.h  |   0
 .../benchmarks/stencil/src/visc_vec/stencil.c |   0
 .../stencil/src/visc_vec/stencil.visc.ll      |   0
 .../benchmarks/stencil/tools/compare-output   |   0
 .../test/parboil/benchmarks/tpacf/DESCRIPTION |   0
 .../test/parboil/benchmarks/tpacf/Makefile    |   0
 .../benchmarks/tpacf/src/base/Makefile        |   0
 .../parboil/benchmarks/tpacf/src/base/args.c  |   0
 .../parboil/benchmarks/tpacf/src/base/args.h  |   0
 .../parboil/benchmarks/tpacf/src/base/main.c  |   0
 .../parboil/benchmarks/tpacf/src/base/model.h |   0
 .../tpacf/src/base/model_compute_cpu.c        |   0
 .../benchmarks/tpacf/src/base/model_io.c      |   0
 .../benchmarks/tpacf/src/cuda/Makefile        |   0
 .../parboil/benchmarks/tpacf/src/cuda/args.cc |   0
 .../parboil/benchmarks/tpacf/src/cuda/args.h  |   0
 .../parboil/benchmarks/tpacf/src/cuda/main.cu |   0
 .../parboil/benchmarks/tpacf/src/cuda/model.h |   0
 .../benchmarks/tpacf/src/cuda/model_io.cc     |   0
 .../benchmarks/tpacf/src/cuda/tpacf_kernel.cu |   0
 .../benchmarks/tpacf/src/cuda_base/Makefile   |   0
 .../benchmarks/tpacf/src/cuda_base/args.cc    |   0
 .../benchmarks/tpacf/src/cuda_base/args.h     |   0
 .../benchmarks/tpacf/src/cuda_base/main.cu    |   0
 .../benchmarks/tpacf/src/cuda_base/model.h    |   0
 .../tpacf/src/cuda_base/model_io.cc           |   0
 .../tpacf/src/cuda_base/tpacf_kernel.cu       |   0
 .../benchmarks/tpacf/src/omp_base/Makefile    |   0
 .../benchmarks/tpacf/src/omp_base/args.c      |   0
 .../benchmarks/tpacf/src/omp_base/args.h      |   0
 .../benchmarks/tpacf/src/omp_base/main.c      |   0
 .../benchmarks/tpacf/src/omp_base/model.h     |   0
 .../tpacf/src/omp_base/model_compute_cpu.c    |   0
 .../benchmarks/tpacf/src/omp_base/model_io.c  |   0
 .../benchmarks/tpacf/src/opencl_base/Makefile |   0
 .../benchmarks/tpacf/src/opencl_base/args.cc  |   0
 .../benchmarks/tpacf/src/opencl_base/args.h   |   0
 .../tpacf/src/opencl_base/kernel.cl           |   0
 .../benchmarks/tpacf/src/opencl_base/main.cc  |   0
 .../benchmarks/tpacf/src/opencl_base/model.cc |   0
 .../benchmarks/tpacf/src/opencl_base/model.h  |   0
 .../tpacf/src/opencl_base_dynamic1d/Makefile  |   0
 .../tpacf/src/opencl_base_dynamic1d/args.cc   |   0
 .../tpacf/src/opencl_base_dynamic1d/args.h    |   0
 .../tpacf/src/opencl_base_dynamic1d/kernel.cl |   0
 .../tpacf/src/opencl_base_dynamic1d/main.cc   |   0
 .../tpacf/src/opencl_base_dynamic1d/model.cc  |   0
 .../tpacf/src/opencl_base_dynamic1d/model.h   |   0
 .../tpacf/src/opencl_cpu_base/Makefile        |   0
 .../tpacf/src/opencl_cpu_base/args.cc         |   0
 .../tpacf/src/opencl_cpu_base/args.h          |   0
 .../tpacf/src/opencl_cpu_base/kernel.cl       |   0
 .../tpacf/src/opencl_cpu_base/main.cc         |   0
 .../tpacf/src/opencl_cpu_base/model.cc        |   0
 .../tpacf/src/opencl_cpu_base/model.h         |   0
 .../tpacf/src/opencl_nvidia/Makefile          |   0
 .../tpacf/src/opencl_nvidia/args.cc           |   0
 .../benchmarks/tpacf/src/opencl_nvidia/args.h |   0
 .../tpacf/src/opencl_nvidia/kernel.cl         |   0
 .../tpacf/src/opencl_nvidia/main.cc           |   0
 .../tpacf/src/opencl_nvidia/model.cc          |   0
 .../tpacf/src/opencl_nvidia/model.h           |   0
 .../benchmarks/tpacf/src/visc/Makefile        |   0
 .../parboil/benchmarks/tpacf/src/visc/args.cc |   0
 .../parboil/benchmarks/tpacf/src/visc/args.h  |   0
 .../parboil/benchmarks/tpacf/src/visc/main.cc |   0
 .../benchmarks/tpacf/src/visc/model.cc        |   0
 .../parboil/benchmarks/tpacf/src/visc/model.h |   0
 .../benchmarks/tpacf/tools/compare-output     |   0
 .../test/parboil/common/Makefile.conf         |   0
 .../parboil/common/Makefile.conf.example-ati  |   0
 .../common/Makefile.conf.example-mcuda        |   0
 .../common/Makefile.conf.example-nvidia       |   0
 .../test/parboil/common/include/parboil.h     |   0
 .../test/parboil/common/include/visc.h        |   0
 .../test/parboil/common/mk/Makefile           |   0
 .../hpvm => hpvm}/test/parboil/common/mk/c.mk |   0
 .../test/parboil/common/mk/cuda.mk            |   0
 .../test/parboil/common/mk/opencl.mk          |   0
 .../test/parboil/common/mk/visc.mk            |   0
 .../test/parboil/common/platform/c.default.mk |   0
 .../test/parboil/common/platform/c.gcc.mk     |   0
 .../parboil/common/platform/cuda.arch20.mk    |   0
 .../parboil/common/platform/cuda.default.mk   |   0
 .../parboil/common/platform/cuda.mcuda.mk     |   0
 .../test/parboil/common/platform/cuda.nvcc.mk |   0
 .../parboil/common/platform/opencl.default.mk |   0
 .../parboil/common/platform/opencl.gcc.mk     |   0
 .../parboil/common/platform/visc.default.mk   |   0
 .../common/python/binaryfilecompare.py        |   0
 .../test/parboil/common/python/filecompare.py |   0
 .../parboil/common/python/textfilecompare.py  |   0
 .../test/parboil/common/src/Makefile          |   0
 .../test/parboil/common/src/parboil.c         |   0
 .../test/parboil/common/src/parboil_cuda.c    |   0
 .../test/parboil/common/src/parboil_opencl.c  |   0
 .../parboil/common/src/subtimerREADME.txt     |   0
 {llvm/tools/hpvm => hpvm}/test/parboil/config |   0
 .../test/parboil/driver/__init__.py           |   0
 .../test/parboil/driver/actions.py            |   0
 .../test/parboil/driver/benchmark.py          |   0
 .../parboil/driver/benchmark.py-darcs-backup0 |   0
 .../test/parboil/driver/error.py              |   0
 .../test/parboil/driver/futures.py            |   0
 .../test/parboil/driver/globals.py            |   0
 .../test/parboil/driver/options.py            |   0
 .../test/parboil/driver/parboilfile.py        |   0
 .../driver/parboilfile.py-darcs-backup0       |   0
 .../test/parboil/driver/ppkg.benchmarks       |   0
 .../test/parboil/driver/ppkg.ignore           |   0
 .../hpvm => hpvm}/test/parboil/driver/ppkg.py |   0
 .../test/parboil/driver/process.py            |   0
 .../test/parboil/driver/sanity_check.py       |   0
 .../hpvm => hpvm}/test/parboil/driver/text.py |   0
 .../tools/hpvm => hpvm}/test/parboil/parboil  |   0
 .../test/parboil/parboilParser.py             |   0
 .../hpvm => hpvm}/test/singleVecNode/Makefile |   0
 .../test/singleVecNode/singleVecNode.c        |   0
 .../test/singleVecNode/visc_singleVecNode.ll  |   0
 .../test/testKernel/kernel-spir32.ll          |   0
 .../test/testKernel/kernel-spir64.ll          |   0
 .../hpvm => hpvm}/test/testKernel/kernel.asm  |   0
 .../hpvm => hpvm}/test/testKernel/kernel.cl   |   0
 .../hpvm => hpvm}/test/testKernel/kernel.ll   |   0
 .../test/unitTests/CreateNodeAndEdge.c        |   0
 .../hpvm => hpvm}/test/unitTests/Makefile     |   0
 .../test/unitTests/MallocIntrinsic.c          |   0
 .../test/unitTests/PipelineIntrinsics.c       |   0
 .../unitTests/PipelineIntrinsics.malloc.c     |   0
 .../test/unitTests/lit.local.cfg              |   0
 .../test/unitTests/temp/3level.ll             |   0
 .../test/unitTests/temp/Makefile              |   0
 .../test/unitTests/temp/lit.local.cfg         |   0
 .../test/unitTests/temp/query2D.ll            |   0
 .../test/unitTests/temp/query3D.ll            |   0
 .../test/unitTests/temp/queryNodeInst.ll      |   0
 .../test/unitTests/temp/queryNumDim.ll        |   0
 .../test/unitTests/temp/queryNumNodeInst.ll   |   0
 .../test/unitTests/temp/singleNode.ll         |   0
 .../test/unitTests/temp/singleNodeStream.ll   |   0
 .../test/unitTests/temp/twoLaunch.ll          |   0
 .../test/unitTests/temp/twoNode.ll            |   0
 .../test/unitTests/temp/twoNodeConnect.ll     |   0
 .../test/unitTests/temp/twoNodeQuery.ll       |   0
 .../test/unitTests/temp/twoNodeStream.ll      |   0
 .../tools/hpvm => hpvm}/test/unitTests/visc.h |   0
 .../hpvm => hpvm}/test/vectorAdd/Makefile     |   0
 .../test/vectorAdd/old_visc_vecadd.ll         |   0
 .../hpvm => hpvm}/test/vectorAdd/vecadd.c     |   0
 .../hpvm => hpvm}/test/vectorAdd/vecadd.ll    |   0
 .../test/vectorAdd/visc_vecadd.ll             |   0
 .../hpvm => hpvm}/visc-rt/CMakeLists.txt      |   0
 .../visc-rt/deviceStatusSwitchIntervals.txt   |   0
 .../visc-rt/device_abstraction.h              |   0
 {llvm/tools/hpvm => hpvm}/visc-rt/makefile    |   0
 {llvm/tools/hpvm => hpvm}/visc-rt/policy.h    |   0
 {llvm/tools/hpvm => hpvm}/visc-rt/visc-rt.cpp |   0
 {llvm/tools/hpvm => hpvm}/visc-rt/visc-rt.h   |   0
 .../benchmarks/hpvm-cava/Makefile.config      |  28 ------------------
 1463 files changed, 28 deletions(-)
 rename {llvm/tools/hpvm => hpvm}/CMakeLists.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/include/BuildDFG/BuildDFG.h (100%)
 rename {llvm/tools/hpvm => hpvm}/include/GenVISC/GenVISC.h (100%)
 rename {llvm/tools/hpvm => hpvm}/include/SupportVISC/DFG2LLVM.h (100%)
 rename {llvm/tools/hpvm => hpvm}/include/SupportVISC/DFGTreeTraversal.h (100%)
 rename {llvm/tools/hpvm => hpvm}/include/SupportVISC/DFGraph.h (100%)
 rename {llvm/tools/hpvm => hpvm}/include/SupportVISC/VISCHint.h (100%)
 rename {llvm/tools/hpvm => hpvm}/include/SupportVISC/VISCTimer.h (100%)
 rename {llvm/tools/hpvm => hpvm}/include/SupportVISC/VISCUtils.h (100%)
 rename {llvm/tools/hpvm => hpvm}/lib/CMakeLists.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/lib/Transforms/BuildDFG/BuildDFG.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/lib/Transforms/BuildDFG/BuildDFG.exports (100%)
 rename {llvm/tools/hpvm => hpvm}/lib/Transforms/BuildDFG/CMakeLists.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/lib/Transforms/BuildDFG/LLVMBuild.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/lib/Transforms/CMakeLists.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/lib/Transforms/ClearDFG/CMakeLists.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/lib/Transforms/ClearDFG/ClearDFG.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/lib/Transforms/ClearDFG/ClearDFG.exports (100%)
 rename {llvm/tools/hpvm => hpvm}/lib/Transforms/ClearDFG/LLVMBuild.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/lib/Transforms/DFG2LLVM_NVPTX/CMakeLists.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.exports (100%)
 rename {llvm/tools/hpvm => hpvm}/lib/Transforms/DFG2LLVM_NVPTX/LLVMBuild.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/lib/Transforms/DFG2LLVM_SPIR/CMakeLists.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/lib/Transforms/DFG2LLVM_SPIR/DFG2LLVM_SPIR.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/lib/Transforms/DFG2LLVM_SPIR/DFG2LLVM_SPIR.exports (100%)
 rename {llvm/tools/hpvm => hpvm}/lib/Transforms/DFG2LLVM_SPIR/LLVMBuild.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/lib/Transforms/DFG2LLVM_X86/CMakeLists.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/lib/Transforms/DFG2LLVM_X86/DFG2LLVM_X86.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/lib/Transforms/DFG2LLVM_X86/DFG2LLVM_X86.exports (100%)
 rename {llvm/tools/hpvm => hpvm}/lib/Transforms/DFG2LLVM_X86/LLVMBuild.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/lib/Transforms/GenVISC/CMakeLists.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/lib/Transforms/GenVISC/GenVISC.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/lib/Transforms/GenVISC/GenVISC.exports (100%)
 rename {llvm/tools/hpvm => hpvm}/lib/Transforms/GenVISC/LLVMBuild.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/lib/Transforms/LocalMem/CMakeLists.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/lib/Transforms/LocalMem/LLVMBuild.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/lib/Transforms/LocalMem/LocalMem.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/lib/Transforms/LocalMem/LocalMem.exports (100%)
 rename {llvm/tools/hpvm => hpvm}/llvm_installer/llvm_installer.sh (100%)
 rename {llvm/tools/hpvm => hpvm}/llvm_patches/.#patch_src.sh (100%)
 rename {llvm/tools/hpvm => hpvm}/llvm_patches/apply_patch.sh (100%)
 rename {llvm/tools/hpvm => hpvm}/llvm_patches/construct_patch.sh (100%)
 rename {llvm/tools/hpvm => hpvm}/llvm_patches/include/Bitcode/LLVMBitCodes.h (100%)
 rename {llvm/tools/hpvm => hpvm}/llvm_patches/include/Bitcode/LLVMBitCodes.h.patch (100%)
 rename {llvm/tools/hpvm => hpvm}/llvm_patches/include/IR/Attributes.td (100%)
 rename {llvm/tools/hpvm => hpvm}/llvm_patches/include/IR/Attributes.td.patch (100%)
 rename {llvm/tools/hpvm => hpvm}/llvm_patches/include/IR/Intrinsics.td (100%)
 rename {llvm/tools/hpvm => hpvm}/llvm_patches/include/IR/Intrinsics.td.patch (100%)
 rename {llvm/tools/hpvm => hpvm}/llvm_patches/include/IR/IntrinsicsVISC.td (100%)
 rename {llvm/tools/hpvm => hpvm}/llvm_patches/include/IR/IntrinsicsVISC.td.patch (100%)
 rename {llvm/tools/hpvm => hpvm}/llvm_patches/include/Support/Debug.h (100%)
 rename {llvm/tools/hpvm => hpvm}/llvm_patches/include/Support/Debug.h.patch (100%)
 rename {llvm/tools/hpvm => hpvm}/llvm_patches/lib/AsmParser/LLLexer.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/llvm_patches/lib/AsmParser/LLLexer.cpp.patch (100%)
 rename {llvm/tools/hpvm => hpvm}/llvm_patches/lib/AsmParser/LLLexer.h (100%)
 rename {llvm/tools/hpvm => hpvm}/llvm_patches/lib/AsmParser/LLLexer.h.patch (100%)
 rename {llvm/tools/hpvm => hpvm}/llvm_patches/lib/AsmParser/LLParser.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/llvm_patches/lib/AsmParser/LLParser.cpp.patch (100%)
 rename {llvm/tools/hpvm => hpvm}/llvm_patches/lib/AsmParser/LLParser.h (100%)
 rename {llvm/tools/hpvm => hpvm}/llvm_patches/lib/AsmParser/LLParser.h.patch (100%)
 rename {llvm/tools/hpvm => hpvm}/llvm_patches/lib/AsmParser/LLToken.h (100%)
 rename {llvm/tools/hpvm => hpvm}/llvm_patches/lib/AsmParser/LLToken.h.patch (100%)
 rename {llvm/tools/hpvm => hpvm}/llvm_patches/lib/Bitcode/Reader/BitcodeReader.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/llvm_patches/lib/Bitcode/Reader/BitcodeReader.cpp.patch (100%)
 rename {llvm/tools/hpvm => hpvm}/llvm_patches/lib/Bitcode/Writer/BitcodeWriter.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/llvm_patches/lib/Bitcode/Writer/BitcodeWriter.cpp.patch (100%)
 rename {llvm/tools/hpvm => hpvm}/llvm_patches/lib/IR/Attributes.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/llvm_patches/lib/IR/Attributes.cpp.patch (100%)
 rename {llvm/tools/hpvm => hpvm}/test/CTestSuite/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/CTestSuite/RUN.script (100%)
 rename {llvm/tools/hpvm => hpvm}/test/CTestSuite/gemm.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/CTestSuite/gemm_2.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/MatrixMultiplication/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/MatrixMultiplication/gemm.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/MatrixMultiplication/visc_gemm.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/MatrixMultiplication/visc_gemm_2_level.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/MatrixMultiplication/visc_gemm_2_level_host.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/MatrixMultiplication/visc_gemm_2_level_outedge.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/MatrixMultiplication/visc_gemm_2_level_param.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/MatrixMultiplication/visc_gemm_ptx.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/edge/CMakeLists.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/test/edge/ESO_Very_Large_Telescope.jpg (100%)
 rename {llvm/tools/hpvm => hpvm}/test/edge/EdgeDetect.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/edge/PipelineEdgeDetect.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/edge/edgetest_10.png (100%)
 rename {llvm/tools/hpvm => hpvm}/test/edge/house.png (100%)
 rename {llvm/tools/hpvm => hpvm}/test/edge/time.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/gemm_opencl/matrixMul/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/gemm_opencl/matrixMul/gemm_opencl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/gemm_opencl/matrixMul/matrixMul.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/gemm_opencl/matrixMul/sgemm.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/gemm_opencl/matrixMul/visc_gemm_opencl.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/gemm_opencl/matrixMul_bc/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/gemm_opencl/matrixMul_bc/gemm_opencl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/gemm_opencl/matrixMul_bc/matrixMul_bc.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/gemm_opencl/matrixMul_bc/sgemm.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/gemm_opencl/matrixMul_sh/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/gemm_opencl/matrixMul_sh/gemm_opencl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/gemm_opencl/matrixMul_sh/matrixMul_sh.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/gemm_opencl/matrixMul_sh/sgemm.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/gemm_opencl/matrixMul_sh_bc/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/gemm_opencl/matrixMul_sh_bc/gemm_opencl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/gemm_opencl/matrixMul_sh_bc/matrixMul_sh_bc.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/gemm_opencl/matrixMul_sh_bc/sgemm.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/lit.local.cfg (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/DIRECTORIES (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/LICENSE (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/README (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/README.benchmarks (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/README.buildsystem (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/RUN.parboil.script (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/DESCRIPTION (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/base/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/cuda/.__afs3805 (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/cuda/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/cuda/config.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/cuda/kernel.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/cuda/main.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/cuda_base/.__afs809D (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/cuda_base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/cuda_base/config.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/cuda_base/kernel.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/cuda_base/main.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/omp_base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/omp_base/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/opencl_base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/opencl_base/OpenCL_common.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/opencl_base/OpenCL_common.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/opencl_base/config.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/opencl_base/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/opencl_base/main.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/OpenCL_common.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/OpenCL_common.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/config.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/kernel-spir64.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/main.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/opencl_nvidia/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/opencl_nvidia/OpenCL_common.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/opencl_nvidia/OpenCL_common.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/opencl_nvidia/config.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/opencl_nvidia/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/opencl_nvidia/main.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/visc/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/visc/config.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/src/visc/main.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/bfs/tools/compare-output (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/DESCRIPTION (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/base/atom.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/base/cutcpu.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/base/cutoff.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/base/excl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/base/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/base/output.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/base/output.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/base/readatom.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/cuda/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/cuda/atom.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/cuda/cutcpu.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/cuda/cutoff.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/cuda/cutoff6overlap.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/cuda/excl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/cuda/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/cuda/output.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/cuda/output.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/cuda/readatom.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/cuda_base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/cuda_base/atom.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/cuda_base/cutcpu.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/cuda_base/cutoff.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/cuda_base/cutoff.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/cuda_base/excl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/cuda_base/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/cuda_base/output.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/cuda_base/output.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/cuda_base/readatom.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/omp_base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/omp_base/atom.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/omp_base/cutcpu.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/omp_base/cutoff.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/omp_base/excl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/omp_base/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/omp_base/output.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/omp_base/output.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/omp_base/readatom.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_base/atom.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_base/cutcpu.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_base/cutoff.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_base/cutoff.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_base/excl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_base/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_base/macros.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_base/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_base/ocl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_base/ocl.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_base/output.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_base/output.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_base/readatom.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/atom.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/cutcpu.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/cutoff.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/cutoff6overlap.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/excl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_visc.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_visc_x64.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_visc_x64.spir (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_x64.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/macros.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/ocl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/ocl.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/output.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/output.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/readatom.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_nvidia/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_nvidia/atom.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_nvidia/cutcpu.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_nvidia/cutoff.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_nvidia/cutoff6overlap.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_nvidia/excl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_nvidia/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_nvidia/macros.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_nvidia/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_nvidia/ocl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_nvidia/ocl.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_nvidia/output.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_nvidia/output.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/opencl_nvidia/readatom.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/visc/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/visc/atom.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/visc/cutcpu.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/visc/cutoff.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/visc/cutoff6overlap.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/visc/excl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/visc/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/visc/macros.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/visc/main.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/visc/ocl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/visc/ocl.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/visc/output.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/visc/output.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/src/visc/readatom.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/cutcp/tools/compare-output (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/DESCRIPTION (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/histo.host.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/histo.nvptx.s (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/base/bmp.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/base/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/base/util.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/base/util.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/cuda/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/cuda/bmp.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/cuda/histo_final.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/cuda/histo_intermediates.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/cuda/histo_main.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/cuda/histo_prescan.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/cuda/main.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/cuda/util.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/cuda/util.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/cuda_base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/cuda_base/bmp.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/cuda_base/histo_final.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/cuda_base/histo_intermediates.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/cuda_base/histo_main.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/cuda_base/histo_prescan.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/cuda_base/main.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/cuda_base/util.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/cuda_base/util.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/omp_base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/omp_base/bmp.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/omp_base/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/omp_base/util.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/omp_base/util.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_base/OpenCL_common.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_base/OpenCL_common.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_base/bmp.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_base/histo_final.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_base/histo_intermediates.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_base/histo_main.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_base/histo_prescan.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_base/main.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_base/util.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_base/util.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/OpenCL_common.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/OpenCL_common.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/bmp.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_final.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_intermediates.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_main.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_prescan.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/kernel_x64.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/kernel_x64.spir (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/main.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/util.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/util.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_nvidia/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_nvidia/OpenCL_common.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_nvidia/OpenCL_common.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_nvidia/bmp.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_nvidia/histo_final.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_nvidia/histo_intermediates.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_nvidia/histo_main.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_nvidia/histo_prescan.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_nvidia/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_nvidia/main.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_nvidia/util.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/opencl_nvidia/util.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/threaded/FauxBlock.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/threaded/FauxBlock.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/threaded/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/threaded/bmp.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/threaded/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/threaded/util.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/threaded/util.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/visc/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/visc/bmp.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/visc/main.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/visc/util.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/visc/util.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/src/visc_one/main.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/histo/tools/compare-output (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/.gitignore (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/CREDITS.TXT (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/LICENSE (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/Makefile.config.example (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/README.md (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/README.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_coefs.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_ctrlPoints.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_destPoints.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_respFcns.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_transform.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_validRange.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_coefs.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_coefs_debug.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_ctrlPoints.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_ctrlPoints_debug.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_destPoints.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_respFcns.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_transform.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_validRange.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/convert.sh (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/docs/hpvm-cava_single-node.png (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/example-face/README.md (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/example-tulip-small/raw_tulip-small.bin (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/example-tulips/._raw_tulips.bin (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/example-tulips/._raw_tulips.png (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips.bin (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips.png (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_demosaic.bin (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_demosaic.png (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_denoise.bin (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_denoise.png (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_gamut.bin (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_gamut.png (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_tone.bin (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_tone.png (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_transform.bin (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_transform.png (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/example-tulips/raw_tulips.bin (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/run-camera-pipeline.sh (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/scripts/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/scripts/cmodule.py (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/scripts/convert_image.py (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/scripts/gamut_map.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/scripts/gamut_map.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/scripts/gamut_map.i (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/scripts/gamut_map_wrap.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/scripts/load_and_convert.py (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/scripts/numpy.i (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/scripts/split_trace.py (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/src/cam-vision-native (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/src/cam_pipe.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/src/cam_pipe.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/src/cam_pipe_utility.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/src/cam_pipe_utility.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/src/defs.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/src/dma_interface.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/src/dma_interface.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/src/gem5_harness.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/src/load_cam_model.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/src/load_cam_model.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/src/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/src/pipe_stages.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/src/pipe_stages.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/src/rename.sh (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/src/utility.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/src/utility.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/hpvm-cava/src/visc.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/kmeans/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/kmeans/src/opencl/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/kmeans/src/opencl/README (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/kmeans/src/opencl/cluster.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/kmeans/src/opencl/getopt.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/kmeans/src/opencl/getopt.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/kmeans/src/opencl/kmeans.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/kmeans/src/opencl/kmeans.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/kmeans/src/opencl/kmeans.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/kmeans/src/opencl/kmeans_clustering.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/kmeans/src/opencl/read_input.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/kmeans/src/opencl/rmse.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/kmeans/src/opencl/run (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/kmeans/src/opencl/unistd.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/kmeans/src/visc/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/kmeans/src/visc/README (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/kmeans/src/visc/cluster.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/kmeans/src/visc/getopt.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/kmeans/src/visc/getopt.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/kmeans/src/visc/kmeans.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/kmeans/src/visc/kmeans.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/kmeans/src/visc/kmeans.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/kmeans/src/visc/kmeans_clustering.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/kmeans/src/visc/read_input.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/kmeans/src/visc/rmse.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/kmeans/src/visc/run (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/kmeans/src/visc/unistd.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/kmeans/tools/compare-output (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/DESCRIPTION (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/cpu/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/cpu/config.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/cpu/lbm.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/cpu/lbm.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/cpu/lbm_1d_array.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/cpu/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/cpu/main.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/cuda/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/cuda/layout_config.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/cuda/lbm.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/cuda/lbm.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/cuda/lbm_kernel.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/cuda/lbm_macros.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/cuda/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/cuda/main.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/cuda_base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/cuda_base/layout_config.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/cuda_base/lbm.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/cuda_base/lbm.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/cuda_base/lbm_kernel.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/cuda_base/lbm_macros.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/cuda_base/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/cuda_base/main.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/omp_cpu/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/omp_cpu/config.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/omp_cpu/lbm.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/omp_cpu/lbm.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/omp_cpu/lbm_1d_array.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/omp_cpu/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/omp_cpu/main.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_base/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_base/layout_config.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_base/lbm.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_base/lbm.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_base/lbm_macros.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_base/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_base/main.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_base/ocl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_base/ocl.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/kernel_offline.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/layout_config.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/lbm.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/lbm.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/lbm_macros.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/main.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/ocl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/ocl.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_long/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_long/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_long/kernel.ir (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_long/kernel_offline.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_long/layout_config.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_long/lbm.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_long/lbm.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_long/lbm_macros.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_long/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_long/main.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_long/ocl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_long/ocl.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_short/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_short/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_short/kernel.ir (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_short/kernel_offline.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_short/layout_config.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_short/lbm.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_short/lbm.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_short/lbm_macros.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_short/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_short/main.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_short/ocl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_cpu_short/ocl.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia/kernel_offline.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia/layout_config.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia/lbm.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia/lbm.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia/lbm_macros.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia/main.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia/ocl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia/ocl.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/kernel_offline.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/layout_config.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/lbm.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/lbm.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/lbm_macros.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/main.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/ocl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/ocl.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/kernel_offline.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/layout_config.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/lbm.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/lbm.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/lbm_macros.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/main.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/ocl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/ocl.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/visc/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/visc/layout_config.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/visc/lbm.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/visc/lbm.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/visc/lbm_macros.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/visc/main.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/src/visc/main.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/lbm/tools/compare-output (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/linear-svm/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/linear-svm/linear-svm.visc.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/linear-svm/src/visc_cm/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/linear-svm/src/visc_cm/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/linear-svm/src/visc_cm/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/llvm-40-34.py (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/merge-tests/DESCRIPTION (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/merge-tests/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/merge-tests/src/2DLeaf/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/merge-tests/src/2DLeaf/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/merge-tests/src/2DLeaf/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/merge-tests/src/2ILeaf/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/merge-tests/src/2ILeaf/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/merge-tests/src/2ILeaf/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/merge-tests/src/2ILeafD/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/merge-tests/src/2ILeafD/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/merge-tests/src/2ILeafD/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/merge-tests/src/2ILeafS/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/merge-tests/src/2ILeafS/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/merge-tests/src/2ILeafS/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/merge-tests/src/2LevelACAC/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/merge-tests/src/2LevelACAC/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/merge-tests/src/2LevelACAC/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/merge-tests/src/2LevelACC/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/merge-tests/src/2LevelACC/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/merge-tests/src/2LevelACC/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/merge-tests/src/2LevelCAC/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/merge-tests/src/2LevelCAC/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/merge-tests/src/2LevelCAC/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/merge-tests/src/2LevelCC/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/merge-tests/src/2LevelCC/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/merge-tests/src/2LevelCC/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/merge-tests/src/2LevelICC/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/merge-tests/src/2LevelICC/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/merge-tests/src/2LevelICC/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/merge-tests/tools/compare-output (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/DESCRIPTION (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/base/CPU_kernels.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/base/CPU_kernels.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/base/UDTypes.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/base/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/cuda-base/CPU_kernels.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/cuda-base/CPU_kernels.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/cuda-base/CUDA_interface.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/cuda-base/CUDA_interface.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/cuda-base/GPU_kernels.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/cuda-base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/cuda-base/UDTypes.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/cuda-base/main.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/cuda-base/scanLargeArray.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/cuda-base/scanLargeArray.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/cuda-base/sort.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/cuda-base/sort.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/cuda/CPU_kernels.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/cuda/CPU_kernels.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/cuda/CUDA_interface.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/cuda/CUDA_interface.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/cuda/GPU_kernels.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/cuda/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/cuda/UDTypes.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/cuda/main.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/cuda/scanLargeArray.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/cuda/scanLargeArray.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/cuda/sort.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/cuda/sort.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/omp_base/CPU_kernels.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/omp_base/CPU_kernels.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/omp_base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/omp_base/UDTypes.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/omp_base/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_base/CPU_kernels.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_base/CPU_kernels.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_base/GPU_kernels.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_common.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_common.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_interface.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_interface.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_base/UDTypes.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_base/main.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_base/scanLargeArray.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_base/scanLargeArray.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_base/scanLargeArray.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_base/sort.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_base/sort.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_base/sort.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/CPU_kernels.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/CPU_kernels.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/GPU_kernels.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_common.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_common.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_interface.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_interface.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/UDTypes.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/main.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/scanLargeArray.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/scanLargeArray.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/scanLargeArray.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/sort.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/sort.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/sort.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/visc/CPU_kernels.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/visc/CPU_kernels.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/visc/GPU_kernels.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/visc/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/visc/OpenCL_common.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/visc/OpenCL_common.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/visc/OpenCL_interface.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/visc/OpenCL_interface.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/visc/UDTypes.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/visc/main.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/visc/scanLargeArray.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/visc/scanLargeArray.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/visc/scanLargeArray.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/visc/sort.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/visc/sort.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/src/visc/sort.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-gridding/tools/compare-output (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/DESCRIPTION (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/recycle/base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/recycle/base/computeQ.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/recycle/base/file.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/recycle/base/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/recycle/base/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/cpu/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/cpu/computeQ.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/cpu/file.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/cpu/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/cpu/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/cuda/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/cuda/computeQ.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/cuda/file.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/cuda/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/cuda/main.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/omp_base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/omp_base/computeQ.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/omp_base/file.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/omp_base/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/omp_base/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/opencl/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/opencl/computeQ.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/opencl/computeQ.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/opencl/file.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/opencl/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/opencl/kernels.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/opencl/macros.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/opencl/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/opencl/ocl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/opencl/ocl.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/opencl_nvidia/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/opencl_nvidia/computeQ.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/opencl_nvidia/computeQ.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/opencl_nvidia/file.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/opencl_nvidia/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/opencl_nvidia/kernels.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/opencl_nvidia/macros.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/opencl_nvidia/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/opencl_nvidia/ocl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/opencl_nvidia/ocl.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/visc/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/src/visc/macros.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/mri-q/tools/compare-output (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/nodeSwap/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/nodeSwap/src/opencl/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/nodeSwap/src/opencl/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/nodeSwap/src/opencl/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/nodeSwap/src/opencl/kernel_offline.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/nodeSwap/src/opencl/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/nodeSwap/tools/compare-output (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/DESCRIPTION (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/copyToVersions.sh (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/gradient.visc.merged.experiments.notimer.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/laplacian.visc.merged.experiments.notimer.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/run.sh (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/runscript.sh (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/Gradient/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/Gradient/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/Gradient/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/GradientMerged/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/GradientMerged/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/GradientMerged/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/Laplacian/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/Laplacian/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/Laplacian/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/LaplacianMerged/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/LaplacianMerged/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/LaplacianMerged/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/visc/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/visc/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/visc/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/visc/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/visc/main.cc.pldi (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/visc/main_demo.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/viscGPU-Scalar-MaxG/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/viscGPU-Scalar-MaxG/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/viscGPU-Scalar-MaxG/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/viscGPU-Scalar-ZC/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/viscGPU-Scalar-ZC/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/viscGPU-Scalar-ZC/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/viscGPU/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/viscGPU/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/viscGPU/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/viscScalar/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/viscScalar/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/viscScalar/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/viscVector-Scalar-MaxG/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/viscVector-Scalar-MaxG/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/viscVector-Scalar-MaxG/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/viscVector-Scalar-ZC/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/viscVector-Scalar-ZC/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/viscVector-Scalar-ZC/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/viscVector/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/viscVector/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/viscVector/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/visc_demo/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/visc_demo/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/visc_demo/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/visc_parallel/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/visc_parallel/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/src/visc_parallel/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/pipeline/tools/compare-output (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/DESCRIPTION (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/base/file.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/base/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/base/image.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/base/image.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/base/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/base/sad.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/base/sad_cpu.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/cpu/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/cpu/file.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/cpu/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/cpu/image.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/cpu/image.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/cpu/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/cpu/sad.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/cpu/sad_cpu.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/cuda/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/cuda/file.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/cuda/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/cuda/image.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/cuda/image.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/cuda/largerBlocks.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/cuda/largerBlocks.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/cuda/main.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/cuda/sad.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/cuda/sad4.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/cuda/sad4.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/cuda_base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/cuda_base/file.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/cuda_base/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/cuda_base/image.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/cuda_base/image.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/cuda_base/largerBlocks.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/cuda_base/largerBlocks.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/cuda_base/main.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/cuda_base/sad.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/cuda_base/sad4.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/cuda_base/sad4.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/opencl_base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/opencl_base/OpenCL_common.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/opencl_base/OpenCL_common.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/opencl_base/file.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/opencl_base/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/opencl_base/image.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/opencl_base/image.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/opencl_base/main.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/opencl_base/sad.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/opencl_base/sad_kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/opencl_base/sad_kernel.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/opencl_nvidia/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/opencl_nvidia/OpenCL_common.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/opencl_nvidia/OpenCL_common.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/opencl_nvidia/file.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/opencl_nvidia/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/opencl_nvidia/image.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/opencl_nvidia/image.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/opencl_nvidia/main.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/opencl_nvidia/main_debug.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/opencl_nvidia/sad.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/opencl_nvidia/sad_kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/opencl_nvidia/sad_kernel.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/visc/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/visc/file.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/visc/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/visc/image.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/visc/image.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/visc/main.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/visc/sad.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/visc/sad_kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/src/visc/sad_kernel.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/tools/compare-output (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sad/tools/compute-one-sad.py (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/saxpy_test/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/saxpy_test/src/defs.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/saxpy_test/src/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/saxpy_test/src/visc.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/DESCRIPTION (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/base/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/base/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/base/sgemm_kernel.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/cuda/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/cuda/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/cuda/main.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/cuda/sgemm_kernel.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/cuda_base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/cuda_base/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/cuda_base/main.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/cuda_base/sgemm_kernel.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/omp_base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/omp_base/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/omp_base/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/omp_base/sgemm_kernel.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_base/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_base/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_base/kernel_offline.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_base/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_base_opt/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_base_opt/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_base_opt/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_base_opt/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_base_vec/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_base_vec/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_base_vec/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_base_vec/kernel_offline.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_base_vec/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu/kernel_offline.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel.ir (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel_offline.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/kernel_offline.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel.ir (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel_offline.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/kernel-spir64.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/kernel.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/test-spir64.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/test.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/test.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_nvidia/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_nvidia/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_nvidia/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_nvidia/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_opt_8/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_opt_8/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_opt_8/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_opt_8/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/visc/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/visc/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/visc/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/visc/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/visc_opt/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/visc_opt/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/visc_opt/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/visc_opt/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/visc_sh/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/visc_sh/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/visc_sh/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/visc_tc/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/visc_tc/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/visc_tc/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/visc_tc_vec/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/visc_tc_vec/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/visc_tc_vec/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/visc_tc_vec/main.visc.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/visc_vec/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/visc_vec/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/visc_vec/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/visc_vec/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/visc_vec/main.visc.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/visc_vec_opt/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/visc_vec_opt/io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/visc_vec_opt/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/visc_vec_opt/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/src/visc_vec_opt/main.visc.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/sgemm/tools/compare-output (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/DESCRIPTION (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/common_src/convert-dataset/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/common_src/convert-dataset/bcsstk32.mtx (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/common_src/convert-dataset/commontools.mk (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/common_src/convert-dataset/convert_dataset.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/common_src/convert-dataset/convert_dataset.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/common_src/convert-dataset/fidapm05.mtx (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/common_src/convert-dataset/fidapm05_rhs1.mtx (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/common_src/convert-dataset/jgl009.mtx (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/common_src/convert-dataset/mmio.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/common_src/convert-dataset/mmio.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/common_src/convert-dataset/test.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cpu/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cpu/file.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cpu/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cpu/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda/file.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda/gpu_info.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda/gpu_info.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda/jds_kernels.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda/main.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda/spmv_jds.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda_base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda_base/file.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda_base/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda_base/gpu_info.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda_base/gpu_info.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda_base/jds_kernels.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda_base/main.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda_base/spmv_jds.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda_base_tex/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda_base_tex/file.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda_base_tex/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda_base_tex/gpu_info.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda_base_tex/gpu_info.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda_base_tex/jds_kernels.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda_base_tex/main.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda_base_tex/spmv_jds.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda_tex/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda_tex/file.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda_tex/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda_tex/gpu_info.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda_tex/gpu_info.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda_tex/jds_kernels.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda_tex/main.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/cuda_tex/spmv_jds.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/omp_base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/omp_base/file.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/omp_base/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/omp_base/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_ati/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_ati/file.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_ati/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_ati/gpu_info.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_ati/gpu_info.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_ati/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_ati/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_ati/ocl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_ati/ocl.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_ati/readme.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_ati_vec/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_ati_vec/file.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_ati_vec/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_ati_vec/gpu_info.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_ati_vec/gpu_info.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_ati_vec/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_ati_vec/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_ati_vec/ocl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_ati_vec/ocl.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_ati_vec/readme.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_base/file.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_base/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_base/gpu_info.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_base/gpu_info.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_base/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_base/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_base/ocl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_base/ocl.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu/file.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu/gpu_info.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu/gpu_info.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu/ocl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu/ocl.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/file.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/gpu_info.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/gpu_info.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/ocl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/ocl.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/file.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/gpu_info.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/gpu_info.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/kernel.ir (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/ocl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/ocl.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu_large/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu_large/file.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu_large/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu_large/gpu_info.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu_large/gpu_info.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu_large/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu_large/kernel.ir (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu_large/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu_large/ocl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_cpu_large/ocl.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_nvidia/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_nvidia/file.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_nvidia/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_nvidia/gpu_info.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_nvidia/gpu_info.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_nvidia/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_nvidia/kernel_offline.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_nvidia/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_nvidia/ocl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_nvidia/ocl.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/file.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/gpu_info.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/gpu_info.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/kernel_offline.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/ocl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/ocl.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/file.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/gpu_info.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/gpu_info.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/kernel_offline.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/ocl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/ocl.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex/file.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex/gpu_info.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex/gpu_info.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex/ocl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex/ocl.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/file.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/gpu_info.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/gpu_info.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/ocl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/ocl.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/file.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/gpu_info.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/gpu_info.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/ocl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/ocl.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/file.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/gpu_info.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/gpu_info.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/ocl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/ocl.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/file.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/gpu_info.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/gpu_info.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/ocl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/ocl.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/visc/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/visc/file.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/visc/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/visc/gpu_info.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/visc/gpu_info.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/visc/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/visc/main.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/visc/main.visc.ll.kernels.bc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/src/visc/main.visc.ll.kernels.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/tools/compare-output (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/spmv/vectorgen/vectorgen.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/DESCRIPTION (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/cpu/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/cpu/common.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/cpu/file.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/cpu/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/cpu/kernels.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/cpu/kernels.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/cpu/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/cuda/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/cuda/common.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/cuda/cuerr.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/cuda/file.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/cuda/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/cuda/kernels.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/cuda/kernels.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/cuda/main.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/cuda_base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/cuda_base/common.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/cuda_base/cuerr.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/cuda_base/file.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/cuda_base/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/cuda_base/kernels.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/cuda_base/main.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/cuda_fermi/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/cuda_fermi/common.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/cuda_fermi/cuerr.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/cuda_fermi/file.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/cuda_fermi/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/cuda_fermi/kernels.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/cuda_fermi/main.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/omp_base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/omp_base/common.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/omp_base/file.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/omp_base/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/omp_base/kernels.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/omp_base/kernels.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/omp_base/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base/common.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base/file.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base/kernel_offline.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_default/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_default/common.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_default/file.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_default/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_default/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_default/kernel_offline.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_default/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_large/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_large/common.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_large/file.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_large/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_large/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_large/kernel_offline.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_large/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_opt/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_opt/common.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_opt/file.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_opt/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_opt/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_opt/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_strided/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_strided/common.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_strided/file.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_strided/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_strided/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_strided/kernel_offline.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_strided/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_vec/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_vec/common.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_vec/file.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_vec/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_vec/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_vec/kernel_offline.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_base_vec/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu/common.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu/file.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu/kernel_offline.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/common.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/file.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/kernel_offline.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu_default/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu_default/common.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu_default/file.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu_default/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel-spir64.bc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel-spir64.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel.ir (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel_offline.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu_default/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu_large/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu_large/common.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu_large/file.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu_large/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel-spir64.bc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel-spir64.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel.ir (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel_offline.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_cpu_large/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_fermi/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_fermi/common.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_fermi/file.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_fermi/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_fermi/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_fermi/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_nvidia/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_nvidia/common.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_nvidia/file.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_nvidia/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_nvidia/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/opencl_nvidia/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/visc/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/visc/common.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/visc/file.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/visc/file.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/visc/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/visc/stencil.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/visc_vec/common.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/visc_vec/stencil.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/src/visc_vec/stencil.visc.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/stencil/tools/compare-output (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/DESCRIPTION (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/base/args.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/base/args.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/base/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/base/model.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/base/model_compute_cpu.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/base/model_io.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/cuda/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/cuda/args.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/cuda/args.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/cuda/main.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/cuda/model.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/cuda/model_io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/cuda/tpacf_kernel.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/cuda_base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/cuda_base/args.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/cuda_base/args.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/cuda_base/main.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/cuda_base/model.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/cuda_base/model_io.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/cuda_base/tpacf_kernel.cu (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/omp_base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/omp_base/args.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/omp_base/args.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/omp_base/main.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/omp_base/model.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/omp_base/model_compute_cpu.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/omp_base/model_io.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/opencl_base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/opencl_base/args.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/opencl_base/args.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/opencl_base/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/opencl_base/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/opencl_base/model.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/opencl_base/model.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/args.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/args.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/model.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/model.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/args.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/args.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/model.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/model.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/opencl_nvidia/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/opencl_nvidia/args.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/opencl_nvidia/args.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/opencl_nvidia/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/opencl_nvidia/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/opencl_nvidia/model.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/opencl_nvidia/model.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/visc/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/visc/args.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/visc/args.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/visc/main.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/visc/model.cc (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/src/visc/model.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/benchmarks/tpacf/tools/compare-output (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/common/Makefile.conf (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/common/Makefile.conf.example-ati (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/common/Makefile.conf.example-mcuda (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/common/Makefile.conf.example-nvidia (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/common/include/parboil.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/common/include/visc.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/common/mk/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/common/mk/c.mk (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/common/mk/cuda.mk (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/common/mk/opencl.mk (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/common/mk/visc.mk (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/common/platform/c.default.mk (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/common/platform/c.gcc.mk (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/common/platform/cuda.arch20.mk (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/common/platform/cuda.default.mk (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/common/platform/cuda.mcuda.mk (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/common/platform/cuda.nvcc.mk (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/common/platform/opencl.default.mk (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/common/platform/opencl.gcc.mk (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/common/platform/visc.default.mk (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/common/python/binaryfilecompare.py (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/common/python/filecompare.py (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/common/python/textfilecompare.py (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/common/src/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/common/src/parboil.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/common/src/parboil_cuda.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/common/src/parboil_opencl.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/common/src/subtimerREADME.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/config (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/driver/__init__.py (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/driver/actions.py (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/driver/benchmark.py (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/driver/benchmark.py-darcs-backup0 (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/driver/error.py (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/driver/futures.py (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/driver/globals.py (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/driver/options.py (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/driver/parboilfile.py (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/driver/parboilfile.py-darcs-backup0 (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/driver/ppkg.benchmarks (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/driver/ppkg.ignore (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/driver/ppkg.py (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/driver/process.py (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/driver/sanity_check.py (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/driver/text.py (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/parboil (100%)
 rename {llvm/tools/hpvm => hpvm}/test/parboil/parboilParser.py (100%)
 rename {llvm/tools/hpvm => hpvm}/test/singleVecNode/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/singleVecNode/singleVecNode.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/singleVecNode/visc_singleVecNode.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/testKernel/kernel-spir32.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/testKernel/kernel-spir64.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/testKernel/kernel.asm (100%)
 rename {llvm/tools/hpvm => hpvm}/test/testKernel/kernel.cl (100%)
 rename {llvm/tools/hpvm => hpvm}/test/testKernel/kernel.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/unitTests/CreateNodeAndEdge.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/unitTests/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/unitTests/MallocIntrinsic.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/unitTests/PipelineIntrinsics.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/unitTests/PipelineIntrinsics.malloc.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/unitTests/lit.local.cfg (100%)
 rename {llvm/tools/hpvm => hpvm}/test/unitTests/temp/3level.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/unitTests/temp/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/unitTests/temp/lit.local.cfg (100%)
 rename {llvm/tools/hpvm => hpvm}/test/unitTests/temp/query2D.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/unitTests/temp/query3D.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/unitTests/temp/queryNodeInst.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/unitTests/temp/queryNumDim.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/unitTests/temp/queryNumNodeInst.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/unitTests/temp/singleNode.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/unitTests/temp/singleNodeStream.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/unitTests/temp/twoLaunch.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/unitTests/temp/twoNode.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/unitTests/temp/twoNodeConnect.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/unitTests/temp/twoNodeQuery.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/unitTests/temp/twoNodeStream.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/unitTests/visc.h (100%)
 rename {llvm/tools/hpvm => hpvm}/test/vectorAdd/Makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/test/vectorAdd/old_visc_vecadd.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/vectorAdd/vecadd.c (100%)
 rename {llvm/tools/hpvm => hpvm}/test/vectorAdd/vecadd.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/test/vectorAdd/visc_vecadd.ll (100%)
 rename {llvm/tools/hpvm => hpvm}/visc-rt/CMakeLists.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/visc-rt/deviceStatusSwitchIntervals.txt (100%)
 rename {llvm/tools/hpvm => hpvm}/visc-rt/device_abstraction.h (100%)
 rename {llvm/tools/hpvm => hpvm}/visc-rt/makefile (100%)
 rename {llvm/tools/hpvm => hpvm}/visc-rt/policy.h (100%)
 rename {llvm/tools/hpvm => hpvm}/visc-rt/visc-rt.cpp (100%)
 rename {llvm/tools/hpvm => hpvm}/visc-rt/visc-rt.h (100%)
 delete mode 100644 llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/Makefile.config

diff --git a/llvm/tools/hpvm/CMakeLists.txt b/hpvm/CMakeLists.txt
similarity index 100%
rename from llvm/tools/hpvm/CMakeLists.txt
rename to hpvm/CMakeLists.txt
diff --git a/llvm/tools/hpvm/include/BuildDFG/BuildDFG.h b/hpvm/include/BuildDFG/BuildDFG.h
similarity index 100%
rename from llvm/tools/hpvm/include/BuildDFG/BuildDFG.h
rename to hpvm/include/BuildDFG/BuildDFG.h
diff --git a/llvm/tools/hpvm/include/GenVISC/GenVISC.h b/hpvm/include/GenVISC/GenVISC.h
similarity index 100%
rename from llvm/tools/hpvm/include/GenVISC/GenVISC.h
rename to hpvm/include/GenVISC/GenVISC.h
diff --git a/llvm/tools/hpvm/include/SupportVISC/DFG2LLVM.h b/hpvm/include/SupportVISC/DFG2LLVM.h
similarity index 100%
rename from llvm/tools/hpvm/include/SupportVISC/DFG2LLVM.h
rename to hpvm/include/SupportVISC/DFG2LLVM.h
diff --git a/llvm/tools/hpvm/include/SupportVISC/DFGTreeTraversal.h b/hpvm/include/SupportVISC/DFGTreeTraversal.h
similarity index 100%
rename from llvm/tools/hpvm/include/SupportVISC/DFGTreeTraversal.h
rename to hpvm/include/SupportVISC/DFGTreeTraversal.h
diff --git a/llvm/tools/hpvm/include/SupportVISC/DFGraph.h b/hpvm/include/SupportVISC/DFGraph.h
similarity index 100%
rename from llvm/tools/hpvm/include/SupportVISC/DFGraph.h
rename to hpvm/include/SupportVISC/DFGraph.h
diff --git a/llvm/tools/hpvm/include/SupportVISC/VISCHint.h b/hpvm/include/SupportVISC/VISCHint.h
similarity index 100%
rename from llvm/tools/hpvm/include/SupportVISC/VISCHint.h
rename to hpvm/include/SupportVISC/VISCHint.h
diff --git a/llvm/tools/hpvm/include/SupportVISC/VISCTimer.h b/hpvm/include/SupportVISC/VISCTimer.h
similarity index 100%
rename from llvm/tools/hpvm/include/SupportVISC/VISCTimer.h
rename to hpvm/include/SupportVISC/VISCTimer.h
diff --git a/llvm/tools/hpvm/include/SupportVISC/VISCUtils.h b/hpvm/include/SupportVISC/VISCUtils.h
similarity index 100%
rename from llvm/tools/hpvm/include/SupportVISC/VISCUtils.h
rename to hpvm/include/SupportVISC/VISCUtils.h
diff --git a/llvm/tools/hpvm/lib/CMakeLists.txt b/hpvm/lib/CMakeLists.txt
similarity index 100%
rename from llvm/tools/hpvm/lib/CMakeLists.txt
rename to hpvm/lib/CMakeLists.txt
diff --git a/llvm/tools/hpvm/lib/Transforms/BuildDFG/BuildDFG.cpp b/hpvm/lib/Transforms/BuildDFG/BuildDFG.cpp
similarity index 100%
rename from llvm/tools/hpvm/lib/Transforms/BuildDFG/BuildDFG.cpp
rename to hpvm/lib/Transforms/BuildDFG/BuildDFG.cpp
diff --git a/llvm/tools/hpvm/lib/Transforms/BuildDFG/BuildDFG.exports b/hpvm/lib/Transforms/BuildDFG/BuildDFG.exports
similarity index 100%
rename from llvm/tools/hpvm/lib/Transforms/BuildDFG/BuildDFG.exports
rename to hpvm/lib/Transforms/BuildDFG/BuildDFG.exports
diff --git a/llvm/tools/hpvm/lib/Transforms/BuildDFG/CMakeLists.txt b/hpvm/lib/Transforms/BuildDFG/CMakeLists.txt
similarity index 100%
rename from llvm/tools/hpvm/lib/Transforms/BuildDFG/CMakeLists.txt
rename to hpvm/lib/Transforms/BuildDFG/CMakeLists.txt
diff --git a/llvm/tools/hpvm/lib/Transforms/BuildDFG/LLVMBuild.txt b/hpvm/lib/Transforms/BuildDFG/LLVMBuild.txt
similarity index 100%
rename from llvm/tools/hpvm/lib/Transforms/BuildDFG/LLVMBuild.txt
rename to hpvm/lib/Transforms/BuildDFG/LLVMBuild.txt
diff --git a/llvm/tools/hpvm/lib/Transforms/CMakeLists.txt b/hpvm/lib/Transforms/CMakeLists.txt
similarity index 100%
rename from llvm/tools/hpvm/lib/Transforms/CMakeLists.txt
rename to hpvm/lib/Transforms/CMakeLists.txt
diff --git a/llvm/tools/hpvm/lib/Transforms/ClearDFG/CMakeLists.txt b/hpvm/lib/Transforms/ClearDFG/CMakeLists.txt
similarity index 100%
rename from llvm/tools/hpvm/lib/Transforms/ClearDFG/CMakeLists.txt
rename to hpvm/lib/Transforms/ClearDFG/CMakeLists.txt
diff --git a/llvm/tools/hpvm/lib/Transforms/ClearDFG/ClearDFG.cpp b/hpvm/lib/Transforms/ClearDFG/ClearDFG.cpp
similarity index 100%
rename from llvm/tools/hpvm/lib/Transforms/ClearDFG/ClearDFG.cpp
rename to hpvm/lib/Transforms/ClearDFG/ClearDFG.cpp
diff --git a/llvm/tools/hpvm/lib/Transforms/ClearDFG/ClearDFG.exports b/hpvm/lib/Transforms/ClearDFG/ClearDFG.exports
similarity index 100%
rename from llvm/tools/hpvm/lib/Transforms/ClearDFG/ClearDFG.exports
rename to hpvm/lib/Transforms/ClearDFG/ClearDFG.exports
diff --git a/llvm/tools/hpvm/lib/Transforms/ClearDFG/LLVMBuild.txt b/hpvm/lib/Transforms/ClearDFG/LLVMBuild.txt
similarity index 100%
rename from llvm/tools/hpvm/lib/Transforms/ClearDFG/LLVMBuild.txt
rename to hpvm/lib/Transforms/ClearDFG/LLVMBuild.txt
diff --git a/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_NVPTX/CMakeLists.txt b/hpvm/lib/Transforms/DFG2LLVM_NVPTX/CMakeLists.txt
similarity index 100%
rename from llvm/tools/hpvm/lib/Transforms/DFG2LLVM_NVPTX/CMakeLists.txt
rename to hpvm/lib/Transforms/DFG2LLVM_NVPTX/CMakeLists.txt
diff --git a/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp b/hpvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp
similarity index 100%
rename from llvm/tools/hpvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp
rename to hpvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp
diff --git a/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.exports b/hpvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.exports
similarity index 100%
rename from llvm/tools/hpvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.exports
rename to hpvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.exports
diff --git a/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_NVPTX/LLVMBuild.txt b/hpvm/lib/Transforms/DFG2LLVM_NVPTX/LLVMBuild.txt
similarity index 100%
rename from llvm/tools/hpvm/lib/Transforms/DFG2LLVM_NVPTX/LLVMBuild.txt
rename to hpvm/lib/Transforms/DFG2LLVM_NVPTX/LLVMBuild.txt
diff --git a/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_SPIR/CMakeLists.txt b/hpvm/lib/Transforms/DFG2LLVM_SPIR/CMakeLists.txt
similarity index 100%
rename from llvm/tools/hpvm/lib/Transforms/DFG2LLVM_SPIR/CMakeLists.txt
rename to hpvm/lib/Transforms/DFG2LLVM_SPIR/CMakeLists.txt
diff --git a/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_SPIR/DFG2LLVM_SPIR.cpp b/hpvm/lib/Transforms/DFG2LLVM_SPIR/DFG2LLVM_SPIR.cpp
similarity index 100%
rename from llvm/tools/hpvm/lib/Transforms/DFG2LLVM_SPIR/DFG2LLVM_SPIR.cpp
rename to hpvm/lib/Transforms/DFG2LLVM_SPIR/DFG2LLVM_SPIR.cpp
diff --git a/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_SPIR/DFG2LLVM_SPIR.exports b/hpvm/lib/Transforms/DFG2LLVM_SPIR/DFG2LLVM_SPIR.exports
similarity index 100%
rename from llvm/tools/hpvm/lib/Transforms/DFG2LLVM_SPIR/DFG2LLVM_SPIR.exports
rename to hpvm/lib/Transforms/DFG2LLVM_SPIR/DFG2LLVM_SPIR.exports
diff --git a/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_SPIR/LLVMBuild.txt b/hpvm/lib/Transforms/DFG2LLVM_SPIR/LLVMBuild.txt
similarity index 100%
rename from llvm/tools/hpvm/lib/Transforms/DFG2LLVM_SPIR/LLVMBuild.txt
rename to hpvm/lib/Transforms/DFG2LLVM_SPIR/LLVMBuild.txt
diff --git a/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_X86/CMakeLists.txt b/hpvm/lib/Transforms/DFG2LLVM_X86/CMakeLists.txt
similarity index 100%
rename from llvm/tools/hpvm/lib/Transforms/DFG2LLVM_X86/CMakeLists.txt
rename to hpvm/lib/Transforms/DFG2LLVM_X86/CMakeLists.txt
diff --git a/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_X86/DFG2LLVM_X86.cpp b/hpvm/lib/Transforms/DFG2LLVM_X86/DFG2LLVM_X86.cpp
similarity index 100%
rename from llvm/tools/hpvm/lib/Transforms/DFG2LLVM_X86/DFG2LLVM_X86.cpp
rename to hpvm/lib/Transforms/DFG2LLVM_X86/DFG2LLVM_X86.cpp
diff --git a/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_X86/DFG2LLVM_X86.exports b/hpvm/lib/Transforms/DFG2LLVM_X86/DFG2LLVM_X86.exports
similarity index 100%
rename from llvm/tools/hpvm/lib/Transforms/DFG2LLVM_X86/DFG2LLVM_X86.exports
rename to hpvm/lib/Transforms/DFG2LLVM_X86/DFG2LLVM_X86.exports
diff --git a/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_X86/LLVMBuild.txt b/hpvm/lib/Transforms/DFG2LLVM_X86/LLVMBuild.txt
similarity index 100%
rename from llvm/tools/hpvm/lib/Transforms/DFG2LLVM_X86/LLVMBuild.txt
rename to hpvm/lib/Transforms/DFG2LLVM_X86/LLVMBuild.txt
diff --git a/llvm/tools/hpvm/lib/Transforms/GenVISC/CMakeLists.txt b/hpvm/lib/Transforms/GenVISC/CMakeLists.txt
similarity index 100%
rename from llvm/tools/hpvm/lib/Transforms/GenVISC/CMakeLists.txt
rename to hpvm/lib/Transforms/GenVISC/CMakeLists.txt
diff --git a/llvm/tools/hpvm/lib/Transforms/GenVISC/GenVISC.cpp b/hpvm/lib/Transforms/GenVISC/GenVISC.cpp
similarity index 100%
rename from llvm/tools/hpvm/lib/Transforms/GenVISC/GenVISC.cpp
rename to hpvm/lib/Transforms/GenVISC/GenVISC.cpp
diff --git a/llvm/tools/hpvm/lib/Transforms/GenVISC/GenVISC.exports b/hpvm/lib/Transforms/GenVISC/GenVISC.exports
similarity index 100%
rename from llvm/tools/hpvm/lib/Transforms/GenVISC/GenVISC.exports
rename to hpvm/lib/Transforms/GenVISC/GenVISC.exports
diff --git a/llvm/tools/hpvm/lib/Transforms/GenVISC/LLVMBuild.txt b/hpvm/lib/Transforms/GenVISC/LLVMBuild.txt
similarity index 100%
rename from llvm/tools/hpvm/lib/Transforms/GenVISC/LLVMBuild.txt
rename to hpvm/lib/Transforms/GenVISC/LLVMBuild.txt
diff --git a/llvm/tools/hpvm/lib/Transforms/LocalMem/CMakeLists.txt b/hpvm/lib/Transforms/LocalMem/CMakeLists.txt
similarity index 100%
rename from llvm/tools/hpvm/lib/Transforms/LocalMem/CMakeLists.txt
rename to hpvm/lib/Transforms/LocalMem/CMakeLists.txt
diff --git a/llvm/tools/hpvm/lib/Transforms/LocalMem/LLVMBuild.txt b/hpvm/lib/Transforms/LocalMem/LLVMBuild.txt
similarity index 100%
rename from llvm/tools/hpvm/lib/Transforms/LocalMem/LLVMBuild.txt
rename to hpvm/lib/Transforms/LocalMem/LLVMBuild.txt
diff --git a/llvm/tools/hpvm/lib/Transforms/LocalMem/LocalMem.cpp b/hpvm/lib/Transforms/LocalMem/LocalMem.cpp
similarity index 100%
rename from llvm/tools/hpvm/lib/Transforms/LocalMem/LocalMem.cpp
rename to hpvm/lib/Transforms/LocalMem/LocalMem.cpp
diff --git a/llvm/tools/hpvm/lib/Transforms/LocalMem/LocalMem.exports b/hpvm/lib/Transforms/LocalMem/LocalMem.exports
similarity index 100%
rename from llvm/tools/hpvm/lib/Transforms/LocalMem/LocalMem.exports
rename to hpvm/lib/Transforms/LocalMem/LocalMem.exports
diff --git a/llvm/tools/hpvm/llvm_installer/llvm_installer.sh b/hpvm/llvm_installer/llvm_installer.sh
similarity index 100%
rename from llvm/tools/hpvm/llvm_installer/llvm_installer.sh
rename to hpvm/llvm_installer/llvm_installer.sh
diff --git a/llvm/tools/hpvm/llvm_patches/.#patch_src.sh b/hpvm/llvm_patches/.#patch_src.sh
similarity index 100%
rename from llvm/tools/hpvm/llvm_patches/.#patch_src.sh
rename to hpvm/llvm_patches/.#patch_src.sh
diff --git a/llvm/tools/hpvm/llvm_patches/apply_patch.sh b/hpvm/llvm_patches/apply_patch.sh
similarity index 100%
rename from llvm/tools/hpvm/llvm_patches/apply_patch.sh
rename to hpvm/llvm_patches/apply_patch.sh
diff --git a/llvm/tools/hpvm/llvm_patches/construct_patch.sh b/hpvm/llvm_patches/construct_patch.sh
similarity index 100%
rename from llvm/tools/hpvm/llvm_patches/construct_patch.sh
rename to hpvm/llvm_patches/construct_patch.sh
diff --git a/llvm/tools/hpvm/llvm_patches/include/Bitcode/LLVMBitCodes.h b/hpvm/llvm_patches/include/Bitcode/LLVMBitCodes.h
similarity index 100%
rename from llvm/tools/hpvm/llvm_patches/include/Bitcode/LLVMBitCodes.h
rename to hpvm/llvm_patches/include/Bitcode/LLVMBitCodes.h
diff --git a/llvm/tools/hpvm/llvm_patches/include/Bitcode/LLVMBitCodes.h.patch b/hpvm/llvm_patches/include/Bitcode/LLVMBitCodes.h.patch
similarity index 100%
rename from llvm/tools/hpvm/llvm_patches/include/Bitcode/LLVMBitCodes.h.patch
rename to hpvm/llvm_patches/include/Bitcode/LLVMBitCodes.h.patch
diff --git a/llvm/tools/hpvm/llvm_patches/include/IR/Attributes.td b/hpvm/llvm_patches/include/IR/Attributes.td
similarity index 100%
rename from llvm/tools/hpvm/llvm_patches/include/IR/Attributes.td
rename to hpvm/llvm_patches/include/IR/Attributes.td
diff --git a/llvm/tools/hpvm/llvm_patches/include/IR/Attributes.td.patch b/hpvm/llvm_patches/include/IR/Attributes.td.patch
similarity index 100%
rename from llvm/tools/hpvm/llvm_patches/include/IR/Attributes.td.patch
rename to hpvm/llvm_patches/include/IR/Attributes.td.patch
diff --git a/llvm/tools/hpvm/llvm_patches/include/IR/Intrinsics.td b/hpvm/llvm_patches/include/IR/Intrinsics.td
similarity index 100%
rename from llvm/tools/hpvm/llvm_patches/include/IR/Intrinsics.td
rename to hpvm/llvm_patches/include/IR/Intrinsics.td
diff --git a/llvm/tools/hpvm/llvm_patches/include/IR/Intrinsics.td.patch b/hpvm/llvm_patches/include/IR/Intrinsics.td.patch
similarity index 100%
rename from llvm/tools/hpvm/llvm_patches/include/IR/Intrinsics.td.patch
rename to hpvm/llvm_patches/include/IR/Intrinsics.td.patch
diff --git a/llvm/tools/hpvm/llvm_patches/include/IR/IntrinsicsVISC.td b/hpvm/llvm_patches/include/IR/IntrinsicsVISC.td
similarity index 100%
rename from llvm/tools/hpvm/llvm_patches/include/IR/IntrinsicsVISC.td
rename to hpvm/llvm_patches/include/IR/IntrinsicsVISC.td
diff --git a/llvm/tools/hpvm/llvm_patches/include/IR/IntrinsicsVISC.td.patch b/hpvm/llvm_patches/include/IR/IntrinsicsVISC.td.patch
similarity index 100%
rename from llvm/tools/hpvm/llvm_patches/include/IR/IntrinsicsVISC.td.patch
rename to hpvm/llvm_patches/include/IR/IntrinsicsVISC.td.patch
diff --git a/llvm/tools/hpvm/llvm_patches/include/Support/Debug.h b/hpvm/llvm_patches/include/Support/Debug.h
similarity index 100%
rename from llvm/tools/hpvm/llvm_patches/include/Support/Debug.h
rename to hpvm/llvm_patches/include/Support/Debug.h
diff --git a/llvm/tools/hpvm/llvm_patches/include/Support/Debug.h.patch b/hpvm/llvm_patches/include/Support/Debug.h.patch
similarity index 100%
rename from llvm/tools/hpvm/llvm_patches/include/Support/Debug.h.patch
rename to hpvm/llvm_patches/include/Support/Debug.h.patch
diff --git a/llvm/tools/hpvm/llvm_patches/lib/AsmParser/LLLexer.cpp b/hpvm/llvm_patches/lib/AsmParser/LLLexer.cpp
similarity index 100%
rename from llvm/tools/hpvm/llvm_patches/lib/AsmParser/LLLexer.cpp
rename to hpvm/llvm_patches/lib/AsmParser/LLLexer.cpp
diff --git a/llvm/tools/hpvm/llvm_patches/lib/AsmParser/LLLexer.cpp.patch b/hpvm/llvm_patches/lib/AsmParser/LLLexer.cpp.patch
similarity index 100%
rename from llvm/tools/hpvm/llvm_patches/lib/AsmParser/LLLexer.cpp.patch
rename to hpvm/llvm_patches/lib/AsmParser/LLLexer.cpp.patch
diff --git a/llvm/tools/hpvm/llvm_patches/lib/AsmParser/LLLexer.h b/hpvm/llvm_patches/lib/AsmParser/LLLexer.h
similarity index 100%
rename from llvm/tools/hpvm/llvm_patches/lib/AsmParser/LLLexer.h
rename to hpvm/llvm_patches/lib/AsmParser/LLLexer.h
diff --git a/llvm/tools/hpvm/llvm_patches/lib/AsmParser/LLLexer.h.patch b/hpvm/llvm_patches/lib/AsmParser/LLLexer.h.patch
similarity index 100%
rename from llvm/tools/hpvm/llvm_patches/lib/AsmParser/LLLexer.h.patch
rename to hpvm/llvm_patches/lib/AsmParser/LLLexer.h.patch
diff --git a/llvm/tools/hpvm/llvm_patches/lib/AsmParser/LLParser.cpp b/hpvm/llvm_patches/lib/AsmParser/LLParser.cpp
similarity index 100%
rename from llvm/tools/hpvm/llvm_patches/lib/AsmParser/LLParser.cpp
rename to hpvm/llvm_patches/lib/AsmParser/LLParser.cpp
diff --git a/llvm/tools/hpvm/llvm_patches/lib/AsmParser/LLParser.cpp.patch b/hpvm/llvm_patches/lib/AsmParser/LLParser.cpp.patch
similarity index 100%
rename from llvm/tools/hpvm/llvm_patches/lib/AsmParser/LLParser.cpp.patch
rename to hpvm/llvm_patches/lib/AsmParser/LLParser.cpp.patch
diff --git a/llvm/tools/hpvm/llvm_patches/lib/AsmParser/LLParser.h b/hpvm/llvm_patches/lib/AsmParser/LLParser.h
similarity index 100%
rename from llvm/tools/hpvm/llvm_patches/lib/AsmParser/LLParser.h
rename to hpvm/llvm_patches/lib/AsmParser/LLParser.h
diff --git a/llvm/tools/hpvm/llvm_patches/lib/AsmParser/LLParser.h.patch b/hpvm/llvm_patches/lib/AsmParser/LLParser.h.patch
similarity index 100%
rename from llvm/tools/hpvm/llvm_patches/lib/AsmParser/LLParser.h.patch
rename to hpvm/llvm_patches/lib/AsmParser/LLParser.h.patch
diff --git a/llvm/tools/hpvm/llvm_patches/lib/AsmParser/LLToken.h b/hpvm/llvm_patches/lib/AsmParser/LLToken.h
similarity index 100%
rename from llvm/tools/hpvm/llvm_patches/lib/AsmParser/LLToken.h
rename to hpvm/llvm_patches/lib/AsmParser/LLToken.h
diff --git a/llvm/tools/hpvm/llvm_patches/lib/AsmParser/LLToken.h.patch b/hpvm/llvm_patches/lib/AsmParser/LLToken.h.patch
similarity index 100%
rename from llvm/tools/hpvm/llvm_patches/lib/AsmParser/LLToken.h.patch
rename to hpvm/llvm_patches/lib/AsmParser/LLToken.h.patch
diff --git a/llvm/tools/hpvm/llvm_patches/lib/Bitcode/Reader/BitcodeReader.cpp b/hpvm/llvm_patches/lib/Bitcode/Reader/BitcodeReader.cpp
similarity index 100%
rename from llvm/tools/hpvm/llvm_patches/lib/Bitcode/Reader/BitcodeReader.cpp
rename to hpvm/llvm_patches/lib/Bitcode/Reader/BitcodeReader.cpp
diff --git a/llvm/tools/hpvm/llvm_patches/lib/Bitcode/Reader/BitcodeReader.cpp.patch b/hpvm/llvm_patches/lib/Bitcode/Reader/BitcodeReader.cpp.patch
similarity index 100%
rename from llvm/tools/hpvm/llvm_patches/lib/Bitcode/Reader/BitcodeReader.cpp.patch
rename to hpvm/llvm_patches/lib/Bitcode/Reader/BitcodeReader.cpp.patch
diff --git a/llvm/tools/hpvm/llvm_patches/lib/Bitcode/Writer/BitcodeWriter.cpp b/hpvm/llvm_patches/lib/Bitcode/Writer/BitcodeWriter.cpp
similarity index 100%
rename from llvm/tools/hpvm/llvm_patches/lib/Bitcode/Writer/BitcodeWriter.cpp
rename to hpvm/llvm_patches/lib/Bitcode/Writer/BitcodeWriter.cpp
diff --git a/llvm/tools/hpvm/llvm_patches/lib/Bitcode/Writer/BitcodeWriter.cpp.patch b/hpvm/llvm_patches/lib/Bitcode/Writer/BitcodeWriter.cpp.patch
similarity index 100%
rename from llvm/tools/hpvm/llvm_patches/lib/Bitcode/Writer/BitcodeWriter.cpp.patch
rename to hpvm/llvm_patches/lib/Bitcode/Writer/BitcodeWriter.cpp.patch
diff --git a/llvm/tools/hpvm/llvm_patches/lib/IR/Attributes.cpp b/hpvm/llvm_patches/lib/IR/Attributes.cpp
similarity index 100%
rename from llvm/tools/hpvm/llvm_patches/lib/IR/Attributes.cpp
rename to hpvm/llvm_patches/lib/IR/Attributes.cpp
diff --git a/llvm/tools/hpvm/llvm_patches/lib/IR/Attributes.cpp.patch b/hpvm/llvm_patches/lib/IR/Attributes.cpp.patch
similarity index 100%
rename from llvm/tools/hpvm/llvm_patches/lib/IR/Attributes.cpp.patch
rename to hpvm/llvm_patches/lib/IR/Attributes.cpp.patch
diff --git a/llvm/tools/hpvm/test/CTestSuite/Makefile b/hpvm/test/CTestSuite/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/CTestSuite/Makefile
rename to hpvm/test/CTestSuite/Makefile
diff --git a/llvm/tools/hpvm/test/CTestSuite/RUN.script b/hpvm/test/CTestSuite/RUN.script
similarity index 100%
rename from llvm/tools/hpvm/test/CTestSuite/RUN.script
rename to hpvm/test/CTestSuite/RUN.script
diff --git a/llvm/tools/hpvm/test/CTestSuite/gemm.c b/hpvm/test/CTestSuite/gemm.c
similarity index 100%
rename from llvm/tools/hpvm/test/CTestSuite/gemm.c
rename to hpvm/test/CTestSuite/gemm.c
diff --git a/llvm/tools/hpvm/test/CTestSuite/gemm_2.c b/hpvm/test/CTestSuite/gemm_2.c
similarity index 100%
rename from llvm/tools/hpvm/test/CTestSuite/gemm_2.c
rename to hpvm/test/CTestSuite/gemm_2.c
diff --git a/llvm/tools/hpvm/test/MatrixMultiplication/Makefile b/hpvm/test/MatrixMultiplication/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/MatrixMultiplication/Makefile
rename to hpvm/test/MatrixMultiplication/Makefile
diff --git a/llvm/tools/hpvm/test/MatrixMultiplication/gemm.c b/hpvm/test/MatrixMultiplication/gemm.c
similarity index 100%
rename from llvm/tools/hpvm/test/MatrixMultiplication/gemm.c
rename to hpvm/test/MatrixMultiplication/gemm.c
diff --git a/llvm/tools/hpvm/test/MatrixMultiplication/visc_gemm.ll b/hpvm/test/MatrixMultiplication/visc_gemm.ll
similarity index 100%
rename from llvm/tools/hpvm/test/MatrixMultiplication/visc_gemm.ll
rename to hpvm/test/MatrixMultiplication/visc_gemm.ll
diff --git a/llvm/tools/hpvm/test/MatrixMultiplication/visc_gemm_2_level.ll b/hpvm/test/MatrixMultiplication/visc_gemm_2_level.ll
similarity index 100%
rename from llvm/tools/hpvm/test/MatrixMultiplication/visc_gemm_2_level.ll
rename to hpvm/test/MatrixMultiplication/visc_gemm_2_level.ll
diff --git a/llvm/tools/hpvm/test/MatrixMultiplication/visc_gemm_2_level_host.ll b/hpvm/test/MatrixMultiplication/visc_gemm_2_level_host.ll
similarity index 100%
rename from llvm/tools/hpvm/test/MatrixMultiplication/visc_gemm_2_level_host.ll
rename to hpvm/test/MatrixMultiplication/visc_gemm_2_level_host.ll
diff --git a/llvm/tools/hpvm/test/MatrixMultiplication/visc_gemm_2_level_outedge.ll b/hpvm/test/MatrixMultiplication/visc_gemm_2_level_outedge.ll
similarity index 100%
rename from llvm/tools/hpvm/test/MatrixMultiplication/visc_gemm_2_level_outedge.ll
rename to hpvm/test/MatrixMultiplication/visc_gemm_2_level_outedge.ll
diff --git a/llvm/tools/hpvm/test/MatrixMultiplication/visc_gemm_2_level_param.ll b/hpvm/test/MatrixMultiplication/visc_gemm_2_level_param.ll
similarity index 100%
rename from llvm/tools/hpvm/test/MatrixMultiplication/visc_gemm_2_level_param.ll
rename to hpvm/test/MatrixMultiplication/visc_gemm_2_level_param.ll
diff --git a/llvm/tools/hpvm/test/MatrixMultiplication/visc_gemm_ptx.ll b/hpvm/test/MatrixMultiplication/visc_gemm_ptx.ll
similarity index 100%
rename from llvm/tools/hpvm/test/MatrixMultiplication/visc_gemm_ptx.ll
rename to hpvm/test/MatrixMultiplication/visc_gemm_ptx.ll
diff --git a/llvm/tools/hpvm/test/edge/CMakeLists.txt b/hpvm/test/edge/CMakeLists.txt
similarity index 100%
rename from llvm/tools/hpvm/test/edge/CMakeLists.txt
rename to hpvm/test/edge/CMakeLists.txt
diff --git a/llvm/tools/hpvm/test/edge/ESO_Very_Large_Telescope.jpg b/hpvm/test/edge/ESO_Very_Large_Telescope.jpg
similarity index 100%
rename from llvm/tools/hpvm/test/edge/ESO_Very_Large_Telescope.jpg
rename to hpvm/test/edge/ESO_Very_Large_Telescope.jpg
diff --git a/llvm/tools/hpvm/test/edge/EdgeDetect.cpp b/hpvm/test/edge/EdgeDetect.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/edge/EdgeDetect.cpp
rename to hpvm/test/edge/EdgeDetect.cpp
diff --git a/llvm/tools/hpvm/test/edge/PipelineEdgeDetect.cpp b/hpvm/test/edge/PipelineEdgeDetect.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/edge/PipelineEdgeDetect.cpp
rename to hpvm/test/edge/PipelineEdgeDetect.cpp
diff --git a/llvm/tools/hpvm/test/edge/edgetest_10.png b/hpvm/test/edge/edgetest_10.png
similarity index 100%
rename from llvm/tools/hpvm/test/edge/edgetest_10.png
rename to hpvm/test/edge/edgetest_10.png
diff --git a/llvm/tools/hpvm/test/edge/house.png b/hpvm/test/edge/house.png
similarity index 100%
rename from llvm/tools/hpvm/test/edge/house.png
rename to hpvm/test/edge/house.png
diff --git a/llvm/tools/hpvm/test/edge/time.h b/hpvm/test/edge/time.h
similarity index 100%
rename from llvm/tools/hpvm/test/edge/time.h
rename to hpvm/test/edge/time.h
diff --git a/llvm/tools/hpvm/test/gemm_opencl/matrixMul/Makefile b/hpvm/test/gemm_opencl/matrixMul/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/gemm_opencl/matrixMul/Makefile
rename to hpvm/test/gemm_opencl/matrixMul/Makefile
diff --git a/llvm/tools/hpvm/test/gemm_opencl/matrixMul/gemm_opencl.c b/hpvm/test/gemm_opencl/matrixMul/gemm_opencl.c
similarity index 100%
rename from llvm/tools/hpvm/test/gemm_opencl/matrixMul/gemm_opencl.c
rename to hpvm/test/gemm_opencl/matrixMul/gemm_opencl.c
diff --git a/llvm/tools/hpvm/test/gemm_opencl/matrixMul/matrixMul.cl b/hpvm/test/gemm_opencl/matrixMul/matrixMul.cl
similarity index 100%
rename from llvm/tools/hpvm/test/gemm_opencl/matrixMul/matrixMul.cl
rename to hpvm/test/gemm_opencl/matrixMul/matrixMul.cl
diff --git a/llvm/tools/hpvm/test/gemm_opencl/matrixMul/sgemm.c b/hpvm/test/gemm_opencl/matrixMul/sgemm.c
similarity index 100%
rename from llvm/tools/hpvm/test/gemm_opencl/matrixMul/sgemm.c
rename to hpvm/test/gemm_opencl/matrixMul/sgemm.c
diff --git a/llvm/tools/hpvm/test/gemm_opencl/matrixMul/visc_gemm_opencl.ll b/hpvm/test/gemm_opencl/matrixMul/visc_gemm_opencl.ll
similarity index 100%
rename from llvm/tools/hpvm/test/gemm_opencl/matrixMul/visc_gemm_opencl.ll
rename to hpvm/test/gemm_opencl/matrixMul/visc_gemm_opencl.ll
diff --git a/llvm/tools/hpvm/test/gemm_opencl/matrixMul_bc/Makefile b/hpvm/test/gemm_opencl/matrixMul_bc/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/gemm_opencl/matrixMul_bc/Makefile
rename to hpvm/test/gemm_opencl/matrixMul_bc/Makefile
diff --git a/llvm/tools/hpvm/test/gemm_opencl/matrixMul_bc/gemm_opencl.c b/hpvm/test/gemm_opencl/matrixMul_bc/gemm_opencl.c
similarity index 100%
rename from llvm/tools/hpvm/test/gemm_opencl/matrixMul_bc/gemm_opencl.c
rename to hpvm/test/gemm_opencl/matrixMul_bc/gemm_opencl.c
diff --git a/llvm/tools/hpvm/test/gemm_opencl/matrixMul_bc/matrixMul_bc.cl b/hpvm/test/gemm_opencl/matrixMul_bc/matrixMul_bc.cl
similarity index 100%
rename from llvm/tools/hpvm/test/gemm_opencl/matrixMul_bc/matrixMul_bc.cl
rename to hpvm/test/gemm_opencl/matrixMul_bc/matrixMul_bc.cl
diff --git a/llvm/tools/hpvm/test/gemm_opencl/matrixMul_bc/sgemm.c b/hpvm/test/gemm_opencl/matrixMul_bc/sgemm.c
similarity index 100%
rename from llvm/tools/hpvm/test/gemm_opencl/matrixMul_bc/sgemm.c
rename to hpvm/test/gemm_opencl/matrixMul_bc/sgemm.c
diff --git a/llvm/tools/hpvm/test/gemm_opencl/matrixMul_sh/Makefile b/hpvm/test/gemm_opencl/matrixMul_sh/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/gemm_opencl/matrixMul_sh/Makefile
rename to hpvm/test/gemm_opencl/matrixMul_sh/Makefile
diff --git a/llvm/tools/hpvm/test/gemm_opencl/matrixMul_sh/gemm_opencl.c b/hpvm/test/gemm_opencl/matrixMul_sh/gemm_opencl.c
similarity index 100%
rename from llvm/tools/hpvm/test/gemm_opencl/matrixMul_sh/gemm_opencl.c
rename to hpvm/test/gemm_opencl/matrixMul_sh/gemm_opencl.c
diff --git a/llvm/tools/hpvm/test/gemm_opencl/matrixMul_sh/matrixMul_sh.cl b/hpvm/test/gemm_opencl/matrixMul_sh/matrixMul_sh.cl
similarity index 100%
rename from llvm/tools/hpvm/test/gemm_opencl/matrixMul_sh/matrixMul_sh.cl
rename to hpvm/test/gemm_opencl/matrixMul_sh/matrixMul_sh.cl
diff --git a/llvm/tools/hpvm/test/gemm_opencl/matrixMul_sh/sgemm.c b/hpvm/test/gemm_opencl/matrixMul_sh/sgemm.c
similarity index 100%
rename from llvm/tools/hpvm/test/gemm_opencl/matrixMul_sh/sgemm.c
rename to hpvm/test/gemm_opencl/matrixMul_sh/sgemm.c
diff --git a/llvm/tools/hpvm/test/gemm_opencl/matrixMul_sh_bc/Makefile b/hpvm/test/gemm_opencl/matrixMul_sh_bc/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/gemm_opencl/matrixMul_sh_bc/Makefile
rename to hpvm/test/gemm_opencl/matrixMul_sh_bc/Makefile
diff --git a/llvm/tools/hpvm/test/gemm_opencl/matrixMul_sh_bc/gemm_opencl.c b/hpvm/test/gemm_opencl/matrixMul_sh_bc/gemm_opencl.c
similarity index 100%
rename from llvm/tools/hpvm/test/gemm_opencl/matrixMul_sh_bc/gemm_opencl.c
rename to hpvm/test/gemm_opencl/matrixMul_sh_bc/gemm_opencl.c
diff --git a/llvm/tools/hpvm/test/gemm_opencl/matrixMul_sh_bc/matrixMul_sh_bc.cl b/hpvm/test/gemm_opencl/matrixMul_sh_bc/matrixMul_sh_bc.cl
similarity index 100%
rename from llvm/tools/hpvm/test/gemm_opencl/matrixMul_sh_bc/matrixMul_sh_bc.cl
rename to hpvm/test/gemm_opencl/matrixMul_sh_bc/matrixMul_sh_bc.cl
diff --git a/llvm/tools/hpvm/test/gemm_opencl/matrixMul_sh_bc/sgemm.c b/hpvm/test/gemm_opencl/matrixMul_sh_bc/sgemm.c
similarity index 100%
rename from llvm/tools/hpvm/test/gemm_opencl/matrixMul_sh_bc/sgemm.c
rename to hpvm/test/gemm_opencl/matrixMul_sh_bc/sgemm.c
diff --git a/llvm/tools/hpvm/test/lit.local.cfg b/hpvm/test/lit.local.cfg
similarity index 100%
rename from llvm/tools/hpvm/test/lit.local.cfg
rename to hpvm/test/lit.local.cfg
diff --git a/llvm/tools/hpvm/test/parboil/DIRECTORIES b/hpvm/test/parboil/DIRECTORIES
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/DIRECTORIES
rename to hpvm/test/parboil/DIRECTORIES
diff --git a/llvm/tools/hpvm/test/parboil/LICENSE b/hpvm/test/parboil/LICENSE
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/LICENSE
rename to hpvm/test/parboil/LICENSE
diff --git a/llvm/tools/hpvm/test/parboil/README b/hpvm/test/parboil/README
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/README
rename to hpvm/test/parboil/README
diff --git a/llvm/tools/hpvm/test/parboil/README.benchmarks b/hpvm/test/parboil/README.benchmarks
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/README.benchmarks
rename to hpvm/test/parboil/README.benchmarks
diff --git a/llvm/tools/hpvm/test/parboil/README.buildsystem b/hpvm/test/parboil/README.buildsystem
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/README.buildsystem
rename to hpvm/test/parboil/README.buildsystem
diff --git a/llvm/tools/hpvm/test/parboil/RUN.parboil.script b/hpvm/test/parboil/RUN.parboil.script
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/RUN.parboil.script
rename to hpvm/test/parboil/RUN.parboil.script
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/DESCRIPTION b/hpvm/test/parboil/benchmarks/bfs/DESCRIPTION
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/DESCRIPTION
rename to hpvm/test/parboil/benchmarks/bfs/DESCRIPTION
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/Makefile b/hpvm/test/parboil/benchmarks/bfs/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/Makefile
rename to hpvm/test/parboil/benchmarks/bfs/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/base/Makefile b/hpvm/test/parboil/benchmarks/bfs/src/base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/base/Makefile
rename to hpvm/test/parboil/benchmarks/bfs/src/base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/base/main.cc b/hpvm/test/parboil/benchmarks/bfs/src/base/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/base/main.cc
rename to hpvm/test/parboil/benchmarks/bfs/src/base/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/cuda/.__afs3805 b/hpvm/test/parboil/benchmarks/bfs/src/cuda/.__afs3805
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/cuda/.__afs3805
rename to hpvm/test/parboil/benchmarks/bfs/src/cuda/.__afs3805
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/cuda/Makefile b/hpvm/test/parboil/benchmarks/bfs/src/cuda/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/cuda/Makefile
rename to hpvm/test/parboil/benchmarks/bfs/src/cuda/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/cuda/config.h b/hpvm/test/parboil/benchmarks/bfs/src/cuda/config.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/cuda/config.h
rename to hpvm/test/parboil/benchmarks/bfs/src/cuda/config.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/cuda/kernel.cu b/hpvm/test/parboil/benchmarks/bfs/src/cuda/kernel.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/cuda/kernel.cu
rename to hpvm/test/parboil/benchmarks/bfs/src/cuda/kernel.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/cuda/main.cu b/hpvm/test/parboil/benchmarks/bfs/src/cuda/main.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/cuda/main.cu
rename to hpvm/test/parboil/benchmarks/bfs/src/cuda/main.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/cuda_base/.__afs809D b/hpvm/test/parboil/benchmarks/bfs/src/cuda_base/.__afs809D
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/cuda_base/.__afs809D
rename to hpvm/test/parboil/benchmarks/bfs/src/cuda_base/.__afs809D
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/cuda_base/Makefile b/hpvm/test/parboil/benchmarks/bfs/src/cuda_base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/cuda_base/Makefile
rename to hpvm/test/parboil/benchmarks/bfs/src/cuda_base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/cuda_base/config.h b/hpvm/test/parboil/benchmarks/bfs/src/cuda_base/config.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/cuda_base/config.h
rename to hpvm/test/parboil/benchmarks/bfs/src/cuda_base/config.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/cuda_base/kernel.cu b/hpvm/test/parboil/benchmarks/bfs/src/cuda_base/kernel.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/cuda_base/kernel.cu
rename to hpvm/test/parboil/benchmarks/bfs/src/cuda_base/kernel.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/cuda_base/main.cu b/hpvm/test/parboil/benchmarks/bfs/src/cuda_base/main.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/cuda_base/main.cu
rename to hpvm/test/parboil/benchmarks/bfs/src/cuda_base/main.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/omp_base/Makefile b/hpvm/test/parboil/benchmarks/bfs/src/omp_base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/omp_base/Makefile
rename to hpvm/test/parboil/benchmarks/bfs/src/omp_base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/omp_base/main.cc b/hpvm/test/parboil/benchmarks/bfs/src/omp_base/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/omp_base/main.cc
rename to hpvm/test/parboil/benchmarks/bfs/src/omp_base/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_base/Makefile b/hpvm/test/parboil/benchmarks/bfs/src/opencl_base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_base/Makefile
rename to hpvm/test/parboil/benchmarks/bfs/src/opencl_base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_base/OpenCL_common.cpp b/hpvm/test/parboil/benchmarks/bfs/src/opencl_base/OpenCL_common.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_base/OpenCL_common.cpp
rename to hpvm/test/parboil/benchmarks/bfs/src/opencl_base/OpenCL_common.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_base/OpenCL_common.h b/hpvm/test/parboil/benchmarks/bfs/src/opencl_base/OpenCL_common.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_base/OpenCL_common.h
rename to hpvm/test/parboil/benchmarks/bfs/src/opencl_base/OpenCL_common.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_base/config.h b/hpvm/test/parboil/benchmarks/bfs/src/opencl_base/config.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_base/config.h
rename to hpvm/test/parboil/benchmarks/bfs/src/opencl_base/config.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_base/kernel.cl b/hpvm/test/parboil/benchmarks/bfs/src/opencl_base/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_base/kernel.cl
rename to hpvm/test/parboil/benchmarks/bfs/src/opencl_base/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_base/main.cpp b/hpvm/test/parboil/benchmarks/bfs/src/opencl_base/main.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_base/main.cpp
rename to hpvm/test/parboil/benchmarks/bfs/src/opencl_base/main.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/Makefile b/hpvm/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/Makefile
rename to hpvm/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/OpenCL_common.cpp b/hpvm/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/OpenCL_common.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/OpenCL_common.cpp
rename to hpvm/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/OpenCL_common.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/OpenCL_common.h b/hpvm/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/OpenCL_common.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/OpenCL_common.h
rename to hpvm/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/OpenCL_common.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/config.h b/hpvm/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/config.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/config.h
rename to hpvm/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/config.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/kernel-spir64.ll b/hpvm/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/kernel-spir64.ll
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/kernel-spir64.ll
rename to hpvm/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/kernel-spir64.ll
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/kernel.cl b/hpvm/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/kernel.cl
rename to hpvm/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/main.cpp b/hpvm/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/main.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/main.cpp
rename to hpvm/test/parboil/benchmarks/bfs/src/opencl_cpu_baseline/main.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_nvidia/Makefile b/hpvm/test/parboil/benchmarks/bfs/src/opencl_nvidia/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_nvidia/Makefile
rename to hpvm/test/parboil/benchmarks/bfs/src/opencl_nvidia/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_nvidia/OpenCL_common.cpp b/hpvm/test/parboil/benchmarks/bfs/src/opencl_nvidia/OpenCL_common.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_nvidia/OpenCL_common.cpp
rename to hpvm/test/parboil/benchmarks/bfs/src/opencl_nvidia/OpenCL_common.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_nvidia/OpenCL_common.h b/hpvm/test/parboil/benchmarks/bfs/src/opencl_nvidia/OpenCL_common.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_nvidia/OpenCL_common.h
rename to hpvm/test/parboil/benchmarks/bfs/src/opencl_nvidia/OpenCL_common.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_nvidia/config.h b/hpvm/test/parboil/benchmarks/bfs/src/opencl_nvidia/config.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_nvidia/config.h
rename to hpvm/test/parboil/benchmarks/bfs/src/opencl_nvidia/config.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_nvidia/kernel.cl b/hpvm/test/parboil/benchmarks/bfs/src/opencl_nvidia/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_nvidia/kernel.cl
rename to hpvm/test/parboil/benchmarks/bfs/src/opencl_nvidia/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_nvidia/main.cpp b/hpvm/test/parboil/benchmarks/bfs/src/opencl_nvidia/main.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/opencl_nvidia/main.cpp
rename to hpvm/test/parboil/benchmarks/bfs/src/opencl_nvidia/main.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/visc/Makefile b/hpvm/test/parboil/benchmarks/bfs/src/visc/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/visc/Makefile
rename to hpvm/test/parboil/benchmarks/bfs/src/visc/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/visc/config.h b/hpvm/test/parboil/benchmarks/bfs/src/visc/config.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/visc/config.h
rename to hpvm/test/parboil/benchmarks/bfs/src/visc/config.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/visc/main.cpp b/hpvm/test/parboil/benchmarks/bfs/src/visc/main.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/src/visc/main.cpp
rename to hpvm/test/parboil/benchmarks/bfs/src/visc/main.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/bfs/tools/compare-output b/hpvm/test/parboil/benchmarks/bfs/tools/compare-output
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/bfs/tools/compare-output
rename to hpvm/test/parboil/benchmarks/bfs/tools/compare-output
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/DESCRIPTION b/hpvm/test/parboil/benchmarks/cutcp/DESCRIPTION
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/DESCRIPTION
rename to hpvm/test/parboil/benchmarks/cutcp/DESCRIPTION
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/Makefile b/hpvm/test/parboil/benchmarks/cutcp/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/Makefile
rename to hpvm/test/parboil/benchmarks/cutcp/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/base/Makefile b/hpvm/test/parboil/benchmarks/cutcp/src/base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/base/Makefile
rename to hpvm/test/parboil/benchmarks/cutcp/src/base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/base/atom.h b/hpvm/test/parboil/benchmarks/cutcp/src/base/atom.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/base/atom.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/base/atom.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/base/cutcpu.c b/hpvm/test/parboil/benchmarks/cutcp/src/base/cutcpu.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/base/cutcpu.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/base/cutcpu.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/base/cutoff.h b/hpvm/test/parboil/benchmarks/cutcp/src/base/cutoff.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/base/cutoff.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/base/cutoff.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/base/excl.c b/hpvm/test/parboil/benchmarks/cutcp/src/base/excl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/base/excl.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/base/excl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/base/main.c b/hpvm/test/parboil/benchmarks/cutcp/src/base/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/base/main.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/base/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/base/output.c b/hpvm/test/parboil/benchmarks/cutcp/src/base/output.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/base/output.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/base/output.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/base/output.h b/hpvm/test/parboil/benchmarks/cutcp/src/base/output.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/base/output.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/base/output.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/base/readatom.c b/hpvm/test/parboil/benchmarks/cutcp/src/base/readatom.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/base/readatom.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/base/readatom.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda/Makefile b/hpvm/test/parboil/benchmarks/cutcp/src/cuda/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda/Makefile
rename to hpvm/test/parboil/benchmarks/cutcp/src/cuda/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda/atom.h b/hpvm/test/parboil/benchmarks/cutcp/src/cuda/atom.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda/atom.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/cuda/atom.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda/cutcpu.c b/hpvm/test/parboil/benchmarks/cutcp/src/cuda/cutcpu.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda/cutcpu.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/cuda/cutcpu.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda/cutoff.h b/hpvm/test/parboil/benchmarks/cutcp/src/cuda/cutoff.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda/cutoff.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/cuda/cutoff.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda/cutoff6overlap.cu b/hpvm/test/parboil/benchmarks/cutcp/src/cuda/cutoff6overlap.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda/cutoff6overlap.cu
rename to hpvm/test/parboil/benchmarks/cutcp/src/cuda/cutoff6overlap.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda/excl.c b/hpvm/test/parboil/benchmarks/cutcp/src/cuda/excl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda/excl.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/cuda/excl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda/main.c b/hpvm/test/parboil/benchmarks/cutcp/src/cuda/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda/main.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/cuda/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda/output.c b/hpvm/test/parboil/benchmarks/cutcp/src/cuda/output.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda/output.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/cuda/output.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda/output.h b/hpvm/test/parboil/benchmarks/cutcp/src/cuda/output.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda/output.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/cuda/output.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda/readatom.c b/hpvm/test/parboil/benchmarks/cutcp/src/cuda/readatom.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda/readatom.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/cuda/readatom.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/Makefile b/hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/Makefile
rename to hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/atom.h b/hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/atom.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/atom.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/atom.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/cutcpu.c b/hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/cutcpu.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/cutcpu.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/cutcpu.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/cutoff.cu b/hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/cutoff.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/cutoff.cu
rename to hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/cutoff.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/cutoff.h b/hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/cutoff.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/cutoff.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/cutoff.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/excl.c b/hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/excl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/excl.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/excl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/main.c b/hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/main.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/output.c b/hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/output.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/output.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/output.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/output.h b/hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/output.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/output.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/output.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/readatom.c b/hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/readatom.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/readatom.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/cuda_base/readatom.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/omp_base/Makefile b/hpvm/test/parboil/benchmarks/cutcp/src/omp_base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/omp_base/Makefile
rename to hpvm/test/parboil/benchmarks/cutcp/src/omp_base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/omp_base/atom.h b/hpvm/test/parboil/benchmarks/cutcp/src/omp_base/atom.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/omp_base/atom.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/omp_base/atom.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/omp_base/cutcpu.c b/hpvm/test/parboil/benchmarks/cutcp/src/omp_base/cutcpu.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/omp_base/cutcpu.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/omp_base/cutcpu.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/omp_base/cutoff.h b/hpvm/test/parboil/benchmarks/cutcp/src/omp_base/cutoff.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/omp_base/cutoff.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/omp_base/cutoff.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/omp_base/excl.c b/hpvm/test/parboil/benchmarks/cutcp/src/omp_base/excl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/omp_base/excl.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/omp_base/excl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/omp_base/main.c b/hpvm/test/parboil/benchmarks/cutcp/src/omp_base/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/omp_base/main.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/omp_base/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/omp_base/output.c b/hpvm/test/parboil/benchmarks/cutcp/src/omp_base/output.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/omp_base/output.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/omp_base/output.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/omp_base/output.h b/hpvm/test/parboil/benchmarks/cutcp/src/omp_base/output.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/omp_base/output.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/omp_base/output.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/omp_base/readatom.c b/hpvm/test/parboil/benchmarks/cutcp/src/omp_base/readatom.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/omp_base/readatom.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/omp_base/readatom.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/Makefile b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/Makefile
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/atom.h b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/atom.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/atom.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/atom.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/cutcpu.c b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/cutcpu.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/cutcpu.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/cutcpu.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/cutoff.c b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/cutoff.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/cutoff.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/cutoff.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/cutoff.h b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/cutoff.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/cutoff.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/cutoff.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/excl.c b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/excl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/excl.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/excl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/kernel.cl b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/kernel.cl
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/macros.h b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/macros.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/macros.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/macros.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/main.c b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/main.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/ocl.c b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/ocl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/ocl.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/ocl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/ocl.h b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/ocl.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/ocl.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/ocl.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/output.c b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/output.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/output.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/output.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/output.h b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/output.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/output.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/output.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/readatom.c b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/readatom.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/readatom.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_base/readatom.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/Makefile b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/Makefile
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/atom.h b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/atom.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/atom.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/atom.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/cutcpu.c b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/cutcpu.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/cutcpu.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/cutcpu.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/cutoff.h b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/cutoff.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/cutoff.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/cutoff.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/cutoff6overlap.c b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/cutoff6overlap.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/cutoff6overlap.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/cutoff6overlap.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/excl.c b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/excl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/excl.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/excl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel.cl b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel.cl
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_visc.cl b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_visc.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_visc.cl
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_visc.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_visc_x64.ll b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_visc_x64.ll
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_visc_x64.ll
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_visc_x64.ll
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_visc_x64.spir b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_visc_x64.spir
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_visc_x64.spir
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_visc_x64.spir
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_x64.ll b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_x64.ll
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_x64.ll
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/kernel_x64.ll
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/macros.h b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/macros.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/macros.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/macros.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/main.c b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/main.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/ocl.c b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/ocl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/ocl.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/ocl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/ocl.h b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/ocl.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/ocl.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/ocl.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/output.c b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/output.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/output.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/output.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/output.h b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/output.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/output.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/output.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/readatom.c b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/readatom.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/readatom.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_cpu_baseline/readatom.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/Makefile b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/Makefile
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/atom.h b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/atom.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/atom.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/atom.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/cutcpu.c b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/cutcpu.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/cutcpu.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/cutcpu.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/cutoff.h b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/cutoff.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/cutoff.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/cutoff.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/cutoff6overlap.c b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/cutoff6overlap.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/cutoff6overlap.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/cutoff6overlap.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/excl.c b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/excl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/excl.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/excl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/kernel.cl b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/kernel.cl
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/macros.h b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/macros.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/macros.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/macros.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/main.c b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/main.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/ocl.c b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/ocl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/ocl.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/ocl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/ocl.h b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/ocl.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/ocl.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/ocl.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/output.c b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/output.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/output.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/output.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/output.h b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/output.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/output.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/output.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/readatom.c b/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/readatom.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/readatom.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/opencl_nvidia/readatom.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/visc/Makefile b/hpvm/test/parboil/benchmarks/cutcp/src/visc/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/visc/Makefile
rename to hpvm/test/parboil/benchmarks/cutcp/src/visc/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/visc/atom.h b/hpvm/test/parboil/benchmarks/cutcp/src/visc/atom.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/visc/atom.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/visc/atom.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/visc/cutcpu.c b/hpvm/test/parboil/benchmarks/cutcp/src/visc/cutcpu.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/visc/cutcpu.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/visc/cutcpu.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/visc/cutoff.h b/hpvm/test/parboil/benchmarks/cutcp/src/visc/cutoff.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/visc/cutoff.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/visc/cutoff.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/visc/cutoff6overlap.c b/hpvm/test/parboil/benchmarks/cutcp/src/visc/cutoff6overlap.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/visc/cutoff6overlap.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/visc/cutoff6overlap.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/visc/excl.c b/hpvm/test/parboil/benchmarks/cutcp/src/visc/excl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/visc/excl.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/visc/excl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/visc/kernel.cl b/hpvm/test/parboil/benchmarks/cutcp/src/visc/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/visc/kernel.cl
rename to hpvm/test/parboil/benchmarks/cutcp/src/visc/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/visc/macros.h b/hpvm/test/parboil/benchmarks/cutcp/src/visc/macros.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/visc/macros.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/visc/macros.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/visc/main.cpp b/hpvm/test/parboil/benchmarks/cutcp/src/visc/main.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/visc/main.cpp
rename to hpvm/test/parboil/benchmarks/cutcp/src/visc/main.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/visc/ocl.c b/hpvm/test/parboil/benchmarks/cutcp/src/visc/ocl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/visc/ocl.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/visc/ocl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/visc/ocl.h b/hpvm/test/parboil/benchmarks/cutcp/src/visc/ocl.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/visc/ocl.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/visc/ocl.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/visc/output.c b/hpvm/test/parboil/benchmarks/cutcp/src/visc/output.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/visc/output.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/visc/output.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/visc/output.h b/hpvm/test/parboil/benchmarks/cutcp/src/visc/output.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/visc/output.h
rename to hpvm/test/parboil/benchmarks/cutcp/src/visc/output.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/visc/readatom.c b/hpvm/test/parboil/benchmarks/cutcp/src/visc/readatom.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/src/visc/readatom.c
rename to hpvm/test/parboil/benchmarks/cutcp/src/visc/readatom.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/cutcp/tools/compare-output b/hpvm/test/parboil/benchmarks/cutcp/tools/compare-output
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/cutcp/tools/compare-output
rename to hpvm/test/parboil/benchmarks/cutcp/tools/compare-output
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/DESCRIPTION b/hpvm/test/parboil/benchmarks/histo/DESCRIPTION
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/DESCRIPTION
rename to hpvm/test/parboil/benchmarks/histo/DESCRIPTION
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/Makefile b/hpvm/test/parboil/benchmarks/histo/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/Makefile
rename to hpvm/test/parboil/benchmarks/histo/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/histo.host.ll b/hpvm/test/parboil/benchmarks/histo/histo.host.ll
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/histo.host.ll
rename to hpvm/test/parboil/benchmarks/histo/histo.host.ll
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/histo.nvptx.s b/hpvm/test/parboil/benchmarks/histo/histo.nvptx.s
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/histo.nvptx.s
rename to hpvm/test/parboil/benchmarks/histo/histo.nvptx.s
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/base/Makefile b/hpvm/test/parboil/benchmarks/histo/src/base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/base/Makefile
rename to hpvm/test/parboil/benchmarks/histo/src/base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/base/bmp.h b/hpvm/test/parboil/benchmarks/histo/src/base/bmp.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/base/bmp.h
rename to hpvm/test/parboil/benchmarks/histo/src/base/bmp.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/base/main.c b/hpvm/test/parboil/benchmarks/histo/src/base/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/base/main.c
rename to hpvm/test/parboil/benchmarks/histo/src/base/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/base/util.c b/hpvm/test/parboil/benchmarks/histo/src/base/util.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/base/util.c
rename to hpvm/test/parboil/benchmarks/histo/src/base/util.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/base/util.h b/hpvm/test/parboil/benchmarks/histo/src/base/util.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/base/util.h
rename to hpvm/test/parboil/benchmarks/histo/src/base/util.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda/Makefile b/hpvm/test/parboil/benchmarks/histo/src/cuda/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda/Makefile
rename to hpvm/test/parboil/benchmarks/histo/src/cuda/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda/bmp.h b/hpvm/test/parboil/benchmarks/histo/src/cuda/bmp.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda/bmp.h
rename to hpvm/test/parboil/benchmarks/histo/src/cuda/bmp.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda/histo_final.cu b/hpvm/test/parboil/benchmarks/histo/src/cuda/histo_final.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda/histo_final.cu
rename to hpvm/test/parboil/benchmarks/histo/src/cuda/histo_final.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda/histo_intermediates.cu b/hpvm/test/parboil/benchmarks/histo/src/cuda/histo_intermediates.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda/histo_intermediates.cu
rename to hpvm/test/parboil/benchmarks/histo/src/cuda/histo_intermediates.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda/histo_main.cu b/hpvm/test/parboil/benchmarks/histo/src/cuda/histo_main.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda/histo_main.cu
rename to hpvm/test/parboil/benchmarks/histo/src/cuda/histo_main.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda/histo_prescan.cu b/hpvm/test/parboil/benchmarks/histo/src/cuda/histo_prescan.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda/histo_prescan.cu
rename to hpvm/test/parboil/benchmarks/histo/src/cuda/histo_prescan.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda/main.cu b/hpvm/test/parboil/benchmarks/histo/src/cuda/main.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda/main.cu
rename to hpvm/test/parboil/benchmarks/histo/src/cuda/main.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda/util.cu b/hpvm/test/parboil/benchmarks/histo/src/cuda/util.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda/util.cu
rename to hpvm/test/parboil/benchmarks/histo/src/cuda/util.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda/util.h b/hpvm/test/parboil/benchmarks/histo/src/cuda/util.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda/util.h
rename to hpvm/test/parboil/benchmarks/histo/src/cuda/util.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda_base/Makefile b/hpvm/test/parboil/benchmarks/histo/src/cuda_base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda_base/Makefile
rename to hpvm/test/parboil/benchmarks/histo/src/cuda_base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda_base/bmp.h b/hpvm/test/parboil/benchmarks/histo/src/cuda_base/bmp.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda_base/bmp.h
rename to hpvm/test/parboil/benchmarks/histo/src/cuda_base/bmp.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda_base/histo_final.cu b/hpvm/test/parboil/benchmarks/histo/src/cuda_base/histo_final.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda_base/histo_final.cu
rename to hpvm/test/parboil/benchmarks/histo/src/cuda_base/histo_final.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda_base/histo_intermediates.cu b/hpvm/test/parboil/benchmarks/histo/src/cuda_base/histo_intermediates.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda_base/histo_intermediates.cu
rename to hpvm/test/parboil/benchmarks/histo/src/cuda_base/histo_intermediates.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda_base/histo_main.cu b/hpvm/test/parboil/benchmarks/histo/src/cuda_base/histo_main.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda_base/histo_main.cu
rename to hpvm/test/parboil/benchmarks/histo/src/cuda_base/histo_main.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda_base/histo_prescan.cu b/hpvm/test/parboil/benchmarks/histo/src/cuda_base/histo_prescan.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda_base/histo_prescan.cu
rename to hpvm/test/parboil/benchmarks/histo/src/cuda_base/histo_prescan.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda_base/main.cu b/hpvm/test/parboil/benchmarks/histo/src/cuda_base/main.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda_base/main.cu
rename to hpvm/test/parboil/benchmarks/histo/src/cuda_base/main.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda_base/util.cu b/hpvm/test/parboil/benchmarks/histo/src/cuda_base/util.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda_base/util.cu
rename to hpvm/test/parboil/benchmarks/histo/src/cuda_base/util.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda_base/util.h b/hpvm/test/parboil/benchmarks/histo/src/cuda_base/util.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/cuda_base/util.h
rename to hpvm/test/parboil/benchmarks/histo/src/cuda_base/util.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/omp_base/Makefile b/hpvm/test/parboil/benchmarks/histo/src/omp_base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/omp_base/Makefile
rename to hpvm/test/parboil/benchmarks/histo/src/omp_base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/omp_base/bmp.h b/hpvm/test/parboil/benchmarks/histo/src/omp_base/bmp.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/omp_base/bmp.h
rename to hpvm/test/parboil/benchmarks/histo/src/omp_base/bmp.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/omp_base/main.c b/hpvm/test/parboil/benchmarks/histo/src/omp_base/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/omp_base/main.c
rename to hpvm/test/parboil/benchmarks/histo/src/omp_base/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/omp_base/util.c b/hpvm/test/parboil/benchmarks/histo/src/omp_base/util.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/omp_base/util.c
rename to hpvm/test/parboil/benchmarks/histo/src/omp_base/util.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/omp_base/util.h b/hpvm/test/parboil/benchmarks/histo/src/omp_base/util.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/omp_base/util.h
rename to hpvm/test/parboil/benchmarks/histo/src/omp_base/util.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_base/Makefile b/hpvm/test/parboil/benchmarks/histo/src/opencl_base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_base/Makefile
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_base/OpenCL_common.cpp b/hpvm/test/parboil/benchmarks/histo/src/opencl_base/OpenCL_common.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_base/OpenCL_common.cpp
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_base/OpenCL_common.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_base/OpenCL_common.h b/hpvm/test/parboil/benchmarks/histo/src/opencl_base/OpenCL_common.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_base/OpenCL_common.h
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_base/OpenCL_common.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_base/bmp.h b/hpvm/test/parboil/benchmarks/histo/src/opencl_base/bmp.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_base/bmp.h
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_base/bmp.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_base/histo_final.cl b/hpvm/test/parboil/benchmarks/histo/src/opencl_base/histo_final.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_base/histo_final.cl
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_base/histo_final.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_base/histo_intermediates.cl b/hpvm/test/parboil/benchmarks/histo/src/opencl_base/histo_intermediates.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_base/histo_intermediates.cl
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_base/histo_intermediates.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_base/histo_main.cl b/hpvm/test/parboil/benchmarks/histo/src/opencl_base/histo_main.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_base/histo_main.cl
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_base/histo_main.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_base/histo_prescan.cl b/hpvm/test/parboil/benchmarks/histo/src/opencl_base/histo_prescan.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_base/histo_prescan.cl
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_base/histo_prescan.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_base/main.cpp b/hpvm/test/parboil/benchmarks/histo/src/opencl_base/main.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_base/main.cpp
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_base/main.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_base/util.cpp b/hpvm/test/parboil/benchmarks/histo/src/opencl_base/util.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_base/util.cpp
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_base/util.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_base/util.h b/hpvm/test/parboil/benchmarks/histo/src/opencl_base/util.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_base/util.h
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_base/util.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/Makefile b/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/Makefile
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/OpenCL_common.cpp b/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/OpenCL_common.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/OpenCL_common.cpp
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/OpenCL_common.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/OpenCL_common.h b/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/OpenCL_common.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/OpenCL_common.h
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/OpenCL_common.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/bmp.h b/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/bmp.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/bmp.h
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/bmp.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_final.cl b/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_final.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_final.cl
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_final.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_intermediates.cl b/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_intermediates.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_intermediates.cl
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_intermediates.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_main.cl b/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_main.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_main.cl
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_main.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_prescan.cl b/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_prescan.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_prescan.cl
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/histo_prescan.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/kernel.cl b/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/kernel.cl
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/kernel_x64.ll b/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/kernel_x64.ll
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/kernel_x64.ll
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/kernel_x64.ll
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/kernel_x64.spir b/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/kernel_x64.spir
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/kernel_x64.spir
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/kernel_x64.spir
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/main.cpp b/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/main.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/main.cpp
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/main.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/util.cpp b/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/util.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/util.cpp
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/util.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/util.h b/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/util.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/util.h
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_cpu_baseline/util.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/Makefile b/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/Makefile
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/OpenCL_common.cpp b/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/OpenCL_common.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/OpenCL_common.cpp
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/OpenCL_common.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/OpenCL_common.h b/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/OpenCL_common.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/OpenCL_common.h
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/OpenCL_common.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/bmp.h b/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/bmp.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/bmp.h
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/bmp.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/histo_final.cl b/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/histo_final.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/histo_final.cl
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/histo_final.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/histo_intermediates.cl b/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/histo_intermediates.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/histo_intermediates.cl
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/histo_intermediates.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/histo_main.cl b/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/histo_main.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/histo_main.cl
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/histo_main.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/histo_prescan.cl b/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/histo_prescan.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/histo_prescan.cl
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/histo_prescan.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/kernel.cl b/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/kernel.cl
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/main.cpp b/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/main.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/main.cpp
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/main.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/util.cpp b/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/util.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/util.cpp
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/util.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/util.h b/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/util.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/util.h
rename to hpvm/test/parboil/benchmarks/histo/src/opencl_nvidia/util.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/threaded/FauxBlock.c b/hpvm/test/parboil/benchmarks/histo/src/threaded/FauxBlock.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/threaded/FauxBlock.c
rename to hpvm/test/parboil/benchmarks/histo/src/threaded/FauxBlock.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/threaded/FauxBlock.h b/hpvm/test/parboil/benchmarks/histo/src/threaded/FauxBlock.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/threaded/FauxBlock.h
rename to hpvm/test/parboil/benchmarks/histo/src/threaded/FauxBlock.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/threaded/Makefile b/hpvm/test/parboil/benchmarks/histo/src/threaded/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/threaded/Makefile
rename to hpvm/test/parboil/benchmarks/histo/src/threaded/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/threaded/bmp.h b/hpvm/test/parboil/benchmarks/histo/src/threaded/bmp.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/threaded/bmp.h
rename to hpvm/test/parboil/benchmarks/histo/src/threaded/bmp.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/threaded/main.c b/hpvm/test/parboil/benchmarks/histo/src/threaded/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/threaded/main.c
rename to hpvm/test/parboil/benchmarks/histo/src/threaded/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/threaded/util.c b/hpvm/test/parboil/benchmarks/histo/src/threaded/util.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/threaded/util.c
rename to hpvm/test/parboil/benchmarks/histo/src/threaded/util.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/threaded/util.h b/hpvm/test/parboil/benchmarks/histo/src/threaded/util.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/threaded/util.h
rename to hpvm/test/parboil/benchmarks/histo/src/threaded/util.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/visc/Makefile b/hpvm/test/parboil/benchmarks/histo/src/visc/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/visc/Makefile
rename to hpvm/test/parboil/benchmarks/histo/src/visc/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/visc/bmp.h b/hpvm/test/parboil/benchmarks/histo/src/visc/bmp.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/visc/bmp.h
rename to hpvm/test/parboil/benchmarks/histo/src/visc/bmp.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/visc/main.cpp b/hpvm/test/parboil/benchmarks/histo/src/visc/main.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/visc/main.cpp
rename to hpvm/test/parboil/benchmarks/histo/src/visc/main.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/visc/util.cpp b/hpvm/test/parboil/benchmarks/histo/src/visc/util.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/visc/util.cpp
rename to hpvm/test/parboil/benchmarks/histo/src/visc/util.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/visc/util.h b/hpvm/test/parboil/benchmarks/histo/src/visc/util.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/visc/util.h
rename to hpvm/test/parboil/benchmarks/histo/src/visc/util.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/src/visc_one/main.cpp b/hpvm/test/parboil/benchmarks/histo/src/visc_one/main.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/src/visc_one/main.cpp
rename to hpvm/test/parboil/benchmarks/histo/src/visc_one/main.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/histo/tools/compare-output b/hpvm/test/parboil/benchmarks/histo/tools/compare-output
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/histo/tools/compare-output
rename to hpvm/test/parboil/benchmarks/histo/tools/compare-output
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/.gitignore b/hpvm/test/parboil/benchmarks/hpvm-cava/.gitignore
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/.gitignore
rename to hpvm/test/parboil/benchmarks/hpvm-cava/.gitignore
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/CREDITS.TXT b/hpvm/test/parboil/benchmarks/hpvm-cava/CREDITS.TXT
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/CREDITS.TXT
rename to hpvm/test/parboil/benchmarks/hpvm-cava/CREDITS.TXT
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/LICENSE b/hpvm/test/parboil/benchmarks/hpvm-cava/LICENSE
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/LICENSE
rename to hpvm/test/parboil/benchmarks/hpvm-cava/LICENSE
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/Makefile b/hpvm/test/parboil/benchmarks/hpvm-cava/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/Makefile
rename to hpvm/test/parboil/benchmarks/hpvm-cava/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/Makefile.config.example b/hpvm/test/parboil/benchmarks/hpvm-cava/Makefile.config.example
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/Makefile.config.example
rename to hpvm/test/parboil/benchmarks/hpvm-cava/Makefile.config.example
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/README.md b/hpvm/test/parboil/benchmarks/hpvm-cava/README.md
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/README.md
rename to hpvm/test/parboil/benchmarks/hpvm-cava/README.md
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/README.txt b/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/README.txt
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/README.txt
rename to hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/README.txt
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_coefs.txt b/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_coefs.txt
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_coefs.txt
rename to hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_coefs.txt
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_ctrlPoints.txt b/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_ctrlPoints.txt
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_ctrlPoints.txt
rename to hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_ctrlPoints.txt
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_destPoints.txt b/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_destPoints.txt
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_destPoints.txt
rename to hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_destPoints.txt
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_respFcns.txt b/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_respFcns.txt
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_respFcns.txt
rename to hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_respFcns.txt
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_transform.txt b/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_transform.txt
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_transform.txt
rename to hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_transform.txt
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_validRange.txt b/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_validRange.txt
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_validRange.txt
rename to hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/jpg2raw_validRange.txt
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_coefs.txt b/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_coefs.txt
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_coefs.txt
rename to hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_coefs.txt
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_coefs_debug.txt b/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_coefs_debug.txt
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_coefs_debug.txt
rename to hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_coefs_debug.txt
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_ctrlPoints.txt b/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_ctrlPoints.txt
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_ctrlPoints.txt
rename to hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_ctrlPoints.txt
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_ctrlPoints_debug.txt b/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_ctrlPoints_debug.txt
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_ctrlPoints_debug.txt
rename to hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_ctrlPoints_debug.txt
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_destPoints.txt b/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_destPoints.txt
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_destPoints.txt
rename to hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_destPoints.txt
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_respFcns.txt b/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_respFcns.txt
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_respFcns.txt
rename to hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_respFcns.txt
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_transform.txt b/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_transform.txt
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_transform.txt
rename to hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_transform.txt
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_validRange.txt b/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_validRange.txt
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_validRange.txt
rename to hpvm/test/parboil/benchmarks/hpvm-cava/cam_models/NikonD7000/raw2jpg_validRange.txt
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/convert.sh b/hpvm/test/parboil/benchmarks/hpvm-cava/convert.sh
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/convert.sh
rename to hpvm/test/parboil/benchmarks/hpvm-cava/convert.sh
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/docs/hpvm-cava_single-node.png b/hpvm/test/parboil/benchmarks/hpvm-cava/docs/hpvm-cava_single-node.png
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/docs/hpvm-cava_single-node.png
rename to hpvm/test/parboil/benchmarks/hpvm-cava/docs/hpvm-cava_single-node.png
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-face/README.md b/hpvm/test/parboil/benchmarks/hpvm-cava/example-face/README.md
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-face/README.md
rename to hpvm/test/parboil/benchmarks/hpvm-cava/example-face/README.md
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulip-small/raw_tulip-small.bin b/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulip-small/raw_tulip-small.bin
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulip-small/raw_tulip-small.bin
rename to hpvm/test/parboil/benchmarks/hpvm-cava/example-tulip-small/raw_tulip-small.bin
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._raw_tulips.bin b/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._raw_tulips.bin
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._raw_tulips.bin
rename to hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._raw_tulips.bin
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._raw_tulips.png b/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._raw_tulips.png
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._raw_tulips.png
rename to hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._raw_tulips.png
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips.bin b/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips.bin
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips.bin
rename to hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips.bin
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips.png b/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips.png
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips.png
rename to hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips.png
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_demosaic.bin b/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_demosaic.bin
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_demosaic.bin
rename to hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_demosaic.bin
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_demosaic.png b/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_demosaic.png
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_demosaic.png
rename to hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_demosaic.png
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_denoise.bin b/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_denoise.bin
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_denoise.bin
rename to hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_denoise.bin
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_denoise.png b/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_denoise.png
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_denoise.png
rename to hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_denoise.png
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_gamut.bin b/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_gamut.bin
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_gamut.bin
rename to hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_gamut.bin
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_gamut.png b/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_gamut.png
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_gamut.png
rename to hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_gamut.png
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_tone.bin b/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_tone.bin
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_tone.bin
rename to hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_tone.bin
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_tone.png b/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_tone.png
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_tone.png
rename to hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_tone.png
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_transform.bin b/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_transform.bin
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_transform.bin
rename to hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_transform.bin
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_transform.png b/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_transform.png
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_transform.png
rename to hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/._tulips_transform.png
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/raw_tulips.bin b/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/raw_tulips.bin
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/raw_tulips.bin
rename to hpvm/test/parboil/benchmarks/hpvm-cava/example-tulips/raw_tulips.bin
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/run-camera-pipeline.sh b/hpvm/test/parboil/benchmarks/hpvm-cava/run-camera-pipeline.sh
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/run-camera-pipeline.sh
rename to hpvm/test/parboil/benchmarks/hpvm-cava/run-camera-pipeline.sh
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/scripts/Makefile b/hpvm/test/parboil/benchmarks/hpvm-cava/scripts/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/scripts/Makefile
rename to hpvm/test/parboil/benchmarks/hpvm-cava/scripts/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/scripts/cmodule.py b/hpvm/test/parboil/benchmarks/hpvm-cava/scripts/cmodule.py
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/scripts/cmodule.py
rename to hpvm/test/parboil/benchmarks/hpvm-cava/scripts/cmodule.py
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/scripts/convert_image.py b/hpvm/test/parboil/benchmarks/hpvm-cava/scripts/convert_image.py
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/scripts/convert_image.py
rename to hpvm/test/parboil/benchmarks/hpvm-cava/scripts/convert_image.py
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/scripts/gamut_map.cc b/hpvm/test/parboil/benchmarks/hpvm-cava/scripts/gamut_map.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/scripts/gamut_map.cc
rename to hpvm/test/parboil/benchmarks/hpvm-cava/scripts/gamut_map.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/scripts/gamut_map.h b/hpvm/test/parboil/benchmarks/hpvm-cava/scripts/gamut_map.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/scripts/gamut_map.h
rename to hpvm/test/parboil/benchmarks/hpvm-cava/scripts/gamut_map.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/scripts/gamut_map.i b/hpvm/test/parboil/benchmarks/hpvm-cava/scripts/gamut_map.i
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/scripts/gamut_map.i
rename to hpvm/test/parboil/benchmarks/hpvm-cava/scripts/gamut_map.i
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/scripts/gamut_map_wrap.cc b/hpvm/test/parboil/benchmarks/hpvm-cava/scripts/gamut_map_wrap.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/scripts/gamut_map_wrap.cc
rename to hpvm/test/parboil/benchmarks/hpvm-cava/scripts/gamut_map_wrap.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/scripts/load_and_convert.py b/hpvm/test/parboil/benchmarks/hpvm-cava/scripts/load_and_convert.py
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/scripts/load_and_convert.py
rename to hpvm/test/parboil/benchmarks/hpvm-cava/scripts/load_and_convert.py
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/scripts/numpy.i b/hpvm/test/parboil/benchmarks/hpvm-cava/scripts/numpy.i
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/scripts/numpy.i
rename to hpvm/test/parboil/benchmarks/hpvm-cava/scripts/numpy.i
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/scripts/split_trace.py b/hpvm/test/parboil/benchmarks/hpvm-cava/scripts/split_trace.py
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/scripts/split_trace.py
rename to hpvm/test/parboil/benchmarks/hpvm-cava/scripts/split_trace.py
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/cam-vision-native b/hpvm/test/parboil/benchmarks/hpvm-cava/src/cam-vision-native
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/cam-vision-native
rename to hpvm/test/parboil/benchmarks/hpvm-cava/src/cam-vision-native
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/cam_pipe.c b/hpvm/test/parboil/benchmarks/hpvm-cava/src/cam_pipe.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/cam_pipe.c
rename to hpvm/test/parboil/benchmarks/hpvm-cava/src/cam_pipe.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/cam_pipe.h b/hpvm/test/parboil/benchmarks/hpvm-cava/src/cam_pipe.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/cam_pipe.h
rename to hpvm/test/parboil/benchmarks/hpvm-cava/src/cam_pipe.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/cam_pipe_utility.c b/hpvm/test/parboil/benchmarks/hpvm-cava/src/cam_pipe_utility.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/cam_pipe_utility.c
rename to hpvm/test/parboil/benchmarks/hpvm-cava/src/cam_pipe_utility.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/cam_pipe_utility.h b/hpvm/test/parboil/benchmarks/hpvm-cava/src/cam_pipe_utility.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/cam_pipe_utility.h
rename to hpvm/test/parboil/benchmarks/hpvm-cava/src/cam_pipe_utility.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/defs.h b/hpvm/test/parboil/benchmarks/hpvm-cava/src/defs.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/defs.h
rename to hpvm/test/parboil/benchmarks/hpvm-cava/src/defs.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/dma_interface.c b/hpvm/test/parboil/benchmarks/hpvm-cava/src/dma_interface.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/dma_interface.c
rename to hpvm/test/parboil/benchmarks/hpvm-cava/src/dma_interface.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/dma_interface.h b/hpvm/test/parboil/benchmarks/hpvm-cava/src/dma_interface.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/dma_interface.h
rename to hpvm/test/parboil/benchmarks/hpvm-cava/src/dma_interface.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/gem5_harness.h b/hpvm/test/parboil/benchmarks/hpvm-cava/src/gem5_harness.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/gem5_harness.h
rename to hpvm/test/parboil/benchmarks/hpvm-cava/src/gem5_harness.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/load_cam_model.c b/hpvm/test/parboil/benchmarks/hpvm-cava/src/load_cam_model.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/load_cam_model.c
rename to hpvm/test/parboil/benchmarks/hpvm-cava/src/load_cam_model.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/load_cam_model.h b/hpvm/test/parboil/benchmarks/hpvm-cava/src/load_cam_model.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/load_cam_model.h
rename to hpvm/test/parboil/benchmarks/hpvm-cava/src/load_cam_model.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/main.c b/hpvm/test/parboil/benchmarks/hpvm-cava/src/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/main.c
rename to hpvm/test/parboil/benchmarks/hpvm-cava/src/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/pipe_stages.c b/hpvm/test/parboil/benchmarks/hpvm-cava/src/pipe_stages.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/pipe_stages.c
rename to hpvm/test/parboil/benchmarks/hpvm-cava/src/pipe_stages.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/pipe_stages.h b/hpvm/test/parboil/benchmarks/hpvm-cava/src/pipe_stages.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/pipe_stages.h
rename to hpvm/test/parboil/benchmarks/hpvm-cava/src/pipe_stages.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/rename.sh b/hpvm/test/parboil/benchmarks/hpvm-cava/src/rename.sh
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/rename.sh
rename to hpvm/test/parboil/benchmarks/hpvm-cava/src/rename.sh
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/utility.c b/hpvm/test/parboil/benchmarks/hpvm-cava/src/utility.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/utility.c
rename to hpvm/test/parboil/benchmarks/hpvm-cava/src/utility.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/utility.h b/hpvm/test/parboil/benchmarks/hpvm-cava/src/utility.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/utility.h
rename to hpvm/test/parboil/benchmarks/hpvm-cava/src/utility.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/visc.h b/hpvm/test/parboil/benchmarks/hpvm-cava/src/visc.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/src/visc.h
rename to hpvm/test/parboil/benchmarks/hpvm-cava/src/visc.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/kmeans/Makefile b/hpvm/test/parboil/benchmarks/kmeans/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/kmeans/Makefile
rename to hpvm/test/parboil/benchmarks/kmeans/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/opencl/Makefile b/hpvm/test/parboil/benchmarks/kmeans/src/opencl/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/opencl/Makefile
rename to hpvm/test/parboil/benchmarks/kmeans/src/opencl/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/opencl/README b/hpvm/test/parboil/benchmarks/kmeans/src/opencl/README
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/opencl/README
rename to hpvm/test/parboil/benchmarks/kmeans/src/opencl/README
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/opencl/cluster.c b/hpvm/test/parboil/benchmarks/kmeans/src/opencl/cluster.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/opencl/cluster.c
rename to hpvm/test/parboil/benchmarks/kmeans/src/opencl/cluster.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/opencl/getopt.c b/hpvm/test/parboil/benchmarks/kmeans/src/opencl/getopt.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/opencl/getopt.c
rename to hpvm/test/parboil/benchmarks/kmeans/src/opencl/getopt.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/opencl/getopt.h b/hpvm/test/parboil/benchmarks/kmeans/src/opencl/getopt.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/opencl/getopt.h
rename to hpvm/test/parboil/benchmarks/kmeans/src/opencl/getopt.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/opencl/kmeans.cl b/hpvm/test/parboil/benchmarks/kmeans/src/opencl/kmeans.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/opencl/kmeans.cl
rename to hpvm/test/parboil/benchmarks/kmeans/src/opencl/kmeans.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/opencl/kmeans.cpp b/hpvm/test/parboil/benchmarks/kmeans/src/opencl/kmeans.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/opencl/kmeans.cpp
rename to hpvm/test/parboil/benchmarks/kmeans/src/opencl/kmeans.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/opencl/kmeans.h b/hpvm/test/parboil/benchmarks/kmeans/src/opencl/kmeans.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/opencl/kmeans.h
rename to hpvm/test/parboil/benchmarks/kmeans/src/opencl/kmeans.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/opencl/kmeans_clustering.c b/hpvm/test/parboil/benchmarks/kmeans/src/opencl/kmeans_clustering.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/opencl/kmeans_clustering.c
rename to hpvm/test/parboil/benchmarks/kmeans/src/opencl/kmeans_clustering.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/opencl/read_input.c b/hpvm/test/parboil/benchmarks/kmeans/src/opencl/read_input.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/opencl/read_input.c
rename to hpvm/test/parboil/benchmarks/kmeans/src/opencl/read_input.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/opencl/rmse.c b/hpvm/test/parboil/benchmarks/kmeans/src/opencl/rmse.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/opencl/rmse.c
rename to hpvm/test/parboil/benchmarks/kmeans/src/opencl/rmse.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/opencl/run b/hpvm/test/parboil/benchmarks/kmeans/src/opencl/run
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/opencl/run
rename to hpvm/test/parboil/benchmarks/kmeans/src/opencl/run
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/opencl/unistd.h b/hpvm/test/parboil/benchmarks/kmeans/src/opencl/unistd.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/opencl/unistd.h
rename to hpvm/test/parboil/benchmarks/kmeans/src/opencl/unistd.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/visc/Makefile b/hpvm/test/parboil/benchmarks/kmeans/src/visc/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/visc/Makefile
rename to hpvm/test/parboil/benchmarks/kmeans/src/visc/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/visc/README b/hpvm/test/parboil/benchmarks/kmeans/src/visc/README
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/visc/README
rename to hpvm/test/parboil/benchmarks/kmeans/src/visc/README
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/visc/cluster.c b/hpvm/test/parboil/benchmarks/kmeans/src/visc/cluster.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/visc/cluster.c
rename to hpvm/test/parboil/benchmarks/kmeans/src/visc/cluster.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/visc/getopt.c b/hpvm/test/parboil/benchmarks/kmeans/src/visc/getopt.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/visc/getopt.c
rename to hpvm/test/parboil/benchmarks/kmeans/src/visc/getopt.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/visc/getopt.h b/hpvm/test/parboil/benchmarks/kmeans/src/visc/getopt.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/visc/getopt.h
rename to hpvm/test/parboil/benchmarks/kmeans/src/visc/getopt.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/visc/kmeans.cl b/hpvm/test/parboil/benchmarks/kmeans/src/visc/kmeans.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/visc/kmeans.cl
rename to hpvm/test/parboil/benchmarks/kmeans/src/visc/kmeans.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/visc/kmeans.cpp b/hpvm/test/parboil/benchmarks/kmeans/src/visc/kmeans.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/visc/kmeans.cpp
rename to hpvm/test/parboil/benchmarks/kmeans/src/visc/kmeans.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/visc/kmeans.h b/hpvm/test/parboil/benchmarks/kmeans/src/visc/kmeans.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/visc/kmeans.h
rename to hpvm/test/parboil/benchmarks/kmeans/src/visc/kmeans.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/visc/kmeans_clustering.c b/hpvm/test/parboil/benchmarks/kmeans/src/visc/kmeans_clustering.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/visc/kmeans_clustering.c
rename to hpvm/test/parboil/benchmarks/kmeans/src/visc/kmeans_clustering.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/visc/read_input.c b/hpvm/test/parboil/benchmarks/kmeans/src/visc/read_input.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/visc/read_input.c
rename to hpvm/test/parboil/benchmarks/kmeans/src/visc/read_input.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/visc/rmse.c b/hpvm/test/parboil/benchmarks/kmeans/src/visc/rmse.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/visc/rmse.c
rename to hpvm/test/parboil/benchmarks/kmeans/src/visc/rmse.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/visc/run b/hpvm/test/parboil/benchmarks/kmeans/src/visc/run
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/visc/run
rename to hpvm/test/parboil/benchmarks/kmeans/src/visc/run
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/visc/unistd.h b/hpvm/test/parboil/benchmarks/kmeans/src/visc/unistd.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/kmeans/src/visc/unistd.h
rename to hpvm/test/parboil/benchmarks/kmeans/src/visc/unistd.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/kmeans/tools/compare-output b/hpvm/test/parboil/benchmarks/kmeans/tools/compare-output
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/kmeans/tools/compare-output
rename to hpvm/test/parboil/benchmarks/kmeans/tools/compare-output
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/DESCRIPTION b/hpvm/test/parboil/benchmarks/lbm/DESCRIPTION
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/DESCRIPTION
rename to hpvm/test/parboil/benchmarks/lbm/DESCRIPTION
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/Makefile b/hpvm/test/parboil/benchmarks/lbm/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/Makefile
rename to hpvm/test/parboil/benchmarks/lbm/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cpu/Makefile b/hpvm/test/parboil/benchmarks/lbm/src/cpu/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cpu/Makefile
rename to hpvm/test/parboil/benchmarks/lbm/src/cpu/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cpu/config.h b/hpvm/test/parboil/benchmarks/lbm/src/cpu/config.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cpu/config.h
rename to hpvm/test/parboil/benchmarks/lbm/src/cpu/config.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cpu/lbm.c b/hpvm/test/parboil/benchmarks/lbm/src/cpu/lbm.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cpu/lbm.c
rename to hpvm/test/parboil/benchmarks/lbm/src/cpu/lbm.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cpu/lbm.h b/hpvm/test/parboil/benchmarks/lbm/src/cpu/lbm.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cpu/lbm.h
rename to hpvm/test/parboil/benchmarks/lbm/src/cpu/lbm.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cpu/lbm_1d_array.h b/hpvm/test/parboil/benchmarks/lbm/src/cpu/lbm_1d_array.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cpu/lbm_1d_array.h
rename to hpvm/test/parboil/benchmarks/lbm/src/cpu/lbm_1d_array.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cpu/main.c b/hpvm/test/parboil/benchmarks/lbm/src/cpu/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cpu/main.c
rename to hpvm/test/parboil/benchmarks/lbm/src/cpu/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cpu/main.h b/hpvm/test/parboil/benchmarks/lbm/src/cpu/main.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cpu/main.h
rename to hpvm/test/parboil/benchmarks/lbm/src/cpu/main.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda/Makefile b/hpvm/test/parboil/benchmarks/lbm/src/cuda/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda/Makefile
rename to hpvm/test/parboil/benchmarks/lbm/src/cuda/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda/layout_config.h b/hpvm/test/parboil/benchmarks/lbm/src/cuda/layout_config.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda/layout_config.h
rename to hpvm/test/parboil/benchmarks/lbm/src/cuda/layout_config.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda/lbm.cu b/hpvm/test/parboil/benchmarks/lbm/src/cuda/lbm.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda/lbm.cu
rename to hpvm/test/parboil/benchmarks/lbm/src/cuda/lbm.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda/lbm.h b/hpvm/test/parboil/benchmarks/lbm/src/cuda/lbm.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda/lbm.h
rename to hpvm/test/parboil/benchmarks/lbm/src/cuda/lbm.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda/lbm_kernel.cu b/hpvm/test/parboil/benchmarks/lbm/src/cuda/lbm_kernel.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda/lbm_kernel.cu
rename to hpvm/test/parboil/benchmarks/lbm/src/cuda/lbm_kernel.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda/lbm_macros.h b/hpvm/test/parboil/benchmarks/lbm/src/cuda/lbm_macros.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda/lbm_macros.h
rename to hpvm/test/parboil/benchmarks/lbm/src/cuda/lbm_macros.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda/main.cc b/hpvm/test/parboil/benchmarks/lbm/src/cuda/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda/main.cc
rename to hpvm/test/parboil/benchmarks/lbm/src/cuda/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda/main.h b/hpvm/test/parboil/benchmarks/lbm/src/cuda/main.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda/main.h
rename to hpvm/test/parboil/benchmarks/lbm/src/cuda/main.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda_base/Makefile b/hpvm/test/parboil/benchmarks/lbm/src/cuda_base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda_base/Makefile
rename to hpvm/test/parboil/benchmarks/lbm/src/cuda_base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda_base/layout_config.h b/hpvm/test/parboil/benchmarks/lbm/src/cuda_base/layout_config.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda_base/layout_config.h
rename to hpvm/test/parboil/benchmarks/lbm/src/cuda_base/layout_config.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda_base/lbm.cu b/hpvm/test/parboil/benchmarks/lbm/src/cuda_base/lbm.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda_base/lbm.cu
rename to hpvm/test/parboil/benchmarks/lbm/src/cuda_base/lbm.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda_base/lbm.h b/hpvm/test/parboil/benchmarks/lbm/src/cuda_base/lbm.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda_base/lbm.h
rename to hpvm/test/parboil/benchmarks/lbm/src/cuda_base/lbm.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda_base/lbm_kernel.cu b/hpvm/test/parboil/benchmarks/lbm/src/cuda_base/lbm_kernel.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda_base/lbm_kernel.cu
rename to hpvm/test/parboil/benchmarks/lbm/src/cuda_base/lbm_kernel.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda_base/lbm_macros.h b/hpvm/test/parboil/benchmarks/lbm/src/cuda_base/lbm_macros.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda_base/lbm_macros.h
rename to hpvm/test/parboil/benchmarks/lbm/src/cuda_base/lbm_macros.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda_base/main.cc b/hpvm/test/parboil/benchmarks/lbm/src/cuda_base/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda_base/main.cc
rename to hpvm/test/parboil/benchmarks/lbm/src/cuda_base/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda_base/main.h b/hpvm/test/parboil/benchmarks/lbm/src/cuda_base/main.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/cuda_base/main.h
rename to hpvm/test/parboil/benchmarks/lbm/src/cuda_base/main.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/omp_cpu/Makefile b/hpvm/test/parboil/benchmarks/lbm/src/omp_cpu/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/omp_cpu/Makefile
rename to hpvm/test/parboil/benchmarks/lbm/src/omp_cpu/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/omp_cpu/config.h b/hpvm/test/parboil/benchmarks/lbm/src/omp_cpu/config.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/omp_cpu/config.h
rename to hpvm/test/parboil/benchmarks/lbm/src/omp_cpu/config.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/omp_cpu/lbm.c b/hpvm/test/parboil/benchmarks/lbm/src/omp_cpu/lbm.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/omp_cpu/lbm.c
rename to hpvm/test/parboil/benchmarks/lbm/src/omp_cpu/lbm.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/omp_cpu/lbm.h b/hpvm/test/parboil/benchmarks/lbm/src/omp_cpu/lbm.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/omp_cpu/lbm.h
rename to hpvm/test/parboil/benchmarks/lbm/src/omp_cpu/lbm.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/omp_cpu/lbm_1d_array.h b/hpvm/test/parboil/benchmarks/lbm/src/omp_cpu/lbm_1d_array.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/omp_cpu/lbm_1d_array.h
rename to hpvm/test/parboil/benchmarks/lbm/src/omp_cpu/lbm_1d_array.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/omp_cpu/main.c b/hpvm/test/parboil/benchmarks/lbm/src/omp_cpu/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/omp_cpu/main.c
rename to hpvm/test/parboil/benchmarks/lbm/src/omp_cpu/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/omp_cpu/main.h b/hpvm/test/parboil/benchmarks/lbm/src/omp_cpu/main.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/omp_cpu/main.h
rename to hpvm/test/parboil/benchmarks/lbm/src/omp_cpu/main.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_base/Makefile b/hpvm/test/parboil/benchmarks/lbm/src/opencl_base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_base/Makefile
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_base/kernel.cl b/hpvm/test/parboil/benchmarks/lbm/src/opencl_base/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_base/kernel.cl
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_base/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_base/layout_config.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_base/layout_config.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_base/layout_config.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_base/layout_config.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_base/lbm.c b/hpvm/test/parboil/benchmarks/lbm/src/opencl_base/lbm.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_base/lbm.c
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_base/lbm.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_base/lbm.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_base/lbm.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_base/lbm.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_base/lbm.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_base/lbm_macros.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_base/lbm_macros.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_base/lbm_macros.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_base/lbm_macros.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_base/main.c b/hpvm/test/parboil/benchmarks/lbm/src/opencl_base/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_base/main.c
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_base/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_base/main.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_base/main.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_base/main.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_base/main.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_base/ocl.c b/hpvm/test/parboil/benchmarks/lbm/src/opencl_base/ocl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_base/ocl.c
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_base/ocl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_base/ocl.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_base/ocl.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_base/ocl.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_base/ocl.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/Makefile b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/Makefile
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/kernel.cl b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/kernel.cl
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/kernel_offline.cl b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/kernel_offline.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/kernel_offline.cl
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/kernel_offline.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/layout_config.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/layout_config.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/layout_config.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/layout_config.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/lbm.c b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/lbm.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/lbm.c
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/lbm.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/lbm.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/lbm.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/lbm.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/lbm.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/lbm_macros.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/lbm_macros.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/lbm_macros.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/lbm_macros.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/main.c b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/main.c
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/main.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/main.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/main.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/main.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/ocl.c b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/ocl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/ocl.c
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/ocl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/ocl.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/ocl.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/ocl.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_baseline/ocl.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/Makefile b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/Makefile
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/kernel.cl b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/kernel.cl
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/kernel.ir b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/kernel.ir
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/kernel.ir
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/kernel.ir
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/kernel_offline.cl b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/kernel_offline.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/kernel_offline.cl
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/kernel_offline.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/layout_config.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/layout_config.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/layout_config.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/layout_config.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/lbm.c b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/lbm.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/lbm.c
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/lbm.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/lbm.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/lbm.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/lbm.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/lbm.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/lbm_macros.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/lbm_macros.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/lbm_macros.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/lbm_macros.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/main.c b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/main.c
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/main.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/main.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/main.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/main.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/ocl.c b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/ocl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/ocl.c
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/ocl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/ocl.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/ocl.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/ocl.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_long/ocl.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/Makefile b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/Makefile
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/kernel.cl b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/kernel.cl
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/kernel.ir b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/kernel.ir
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/kernel.ir
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/kernel.ir
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/kernel_offline.cl b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/kernel_offline.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/kernel_offline.cl
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/kernel_offline.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/layout_config.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/layout_config.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/layout_config.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/layout_config.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/lbm.c b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/lbm.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/lbm.c
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/lbm.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/lbm.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/lbm.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/lbm.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/lbm.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/lbm_macros.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/lbm_macros.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/lbm_macros.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/lbm_macros.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/main.c b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/main.c
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/main.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/main.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/main.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/main.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/ocl.c b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/ocl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/ocl.c
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/ocl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/ocl.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/ocl.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/ocl.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_cpu_short/ocl.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/Makefile b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/Makefile
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/kernel.cl b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/kernel.cl
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/kernel_offline.cl b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/kernel_offline.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/kernel_offline.cl
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/kernel_offline.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/layout_config.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/layout_config.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/layout_config.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/layout_config.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/lbm.c b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/lbm.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/lbm.c
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/lbm.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/lbm.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/lbm.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/lbm.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/lbm.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/lbm_macros.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/lbm_macros.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/lbm_macros.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/lbm_macros.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/main.c b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/main.c
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/main.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/main.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/main.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/main.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/ocl.c b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/ocl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/ocl.c
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/ocl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/ocl.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/ocl.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/ocl.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia/ocl.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/Makefile b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/Makefile
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/kernel.cl b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/kernel.cl
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/kernel_offline.cl b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/kernel_offline.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/kernel_offline.cl
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/kernel_offline.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/layout_config.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/layout_config.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/layout_config.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/layout_config.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/lbm.c b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/lbm.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/lbm.c
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/lbm.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/lbm.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/lbm.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/lbm.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/lbm.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/lbm_macros.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/lbm_macros.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/lbm_macros.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/lbm_macros.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/main.c b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/main.c
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/main.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/main.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/main.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/main.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/ocl.c b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/ocl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/ocl.c
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/ocl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/ocl.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/ocl.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/ocl.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_long/ocl.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/Makefile b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/Makefile
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/kernel.cl b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/kernel.cl
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/kernel_offline.cl b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/kernel_offline.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/kernel_offline.cl
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/kernel_offline.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/layout_config.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/layout_config.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/layout_config.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/layout_config.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/lbm.c b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/lbm.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/lbm.c
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/lbm.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/lbm.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/lbm.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/lbm.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/lbm.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/lbm_macros.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/lbm_macros.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/lbm_macros.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/lbm_macros.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/main.c b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/main.c
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/main.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/main.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/main.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/main.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/ocl.c b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/ocl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/ocl.c
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/ocl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/ocl.h b/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/ocl.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/ocl.h
rename to hpvm/test/parboil/benchmarks/lbm/src/opencl_nvidia_short/ocl.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/visc/Makefile b/hpvm/test/parboil/benchmarks/lbm/src/visc/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/visc/Makefile
rename to hpvm/test/parboil/benchmarks/lbm/src/visc/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/visc/layout_config.h b/hpvm/test/parboil/benchmarks/lbm/src/visc/layout_config.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/visc/layout_config.h
rename to hpvm/test/parboil/benchmarks/lbm/src/visc/layout_config.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/visc/lbm.cpp b/hpvm/test/parboil/benchmarks/lbm/src/visc/lbm.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/visc/lbm.cpp
rename to hpvm/test/parboil/benchmarks/lbm/src/visc/lbm.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/visc/lbm.h b/hpvm/test/parboil/benchmarks/lbm/src/visc/lbm.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/visc/lbm.h
rename to hpvm/test/parboil/benchmarks/lbm/src/visc/lbm.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/visc/lbm_macros.h b/hpvm/test/parboil/benchmarks/lbm/src/visc/lbm_macros.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/visc/lbm_macros.h
rename to hpvm/test/parboil/benchmarks/lbm/src/visc/lbm_macros.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/visc/main.cpp b/hpvm/test/parboil/benchmarks/lbm/src/visc/main.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/visc/main.cpp
rename to hpvm/test/parboil/benchmarks/lbm/src/visc/main.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/visc/main.h b/hpvm/test/parboil/benchmarks/lbm/src/visc/main.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/src/visc/main.h
rename to hpvm/test/parboil/benchmarks/lbm/src/visc/main.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/lbm/tools/compare-output b/hpvm/test/parboil/benchmarks/lbm/tools/compare-output
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/lbm/tools/compare-output
rename to hpvm/test/parboil/benchmarks/lbm/tools/compare-output
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/linear-svm/Makefile b/hpvm/test/parboil/benchmarks/linear-svm/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/linear-svm/Makefile
rename to hpvm/test/parboil/benchmarks/linear-svm/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/linear-svm/linear-svm.visc.ll b/hpvm/test/parboil/benchmarks/linear-svm/linear-svm.visc.ll
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/linear-svm/linear-svm.visc.ll
rename to hpvm/test/parboil/benchmarks/linear-svm/linear-svm.visc.ll
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/linear-svm/src/visc_cm/Makefile b/hpvm/test/parboil/benchmarks/linear-svm/src/visc_cm/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/linear-svm/src/visc_cm/Makefile
rename to hpvm/test/parboil/benchmarks/linear-svm/src/visc_cm/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/linear-svm/src/visc_cm/io.cc b/hpvm/test/parboil/benchmarks/linear-svm/src/visc_cm/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/linear-svm/src/visc_cm/io.cc
rename to hpvm/test/parboil/benchmarks/linear-svm/src/visc_cm/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/linear-svm/src/visc_cm/main.cc b/hpvm/test/parboil/benchmarks/linear-svm/src/visc_cm/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/linear-svm/src/visc_cm/main.cc
rename to hpvm/test/parboil/benchmarks/linear-svm/src/visc_cm/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/llvm-40-34.py b/hpvm/test/parboil/benchmarks/llvm-40-34.py
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/llvm-40-34.py
rename to hpvm/test/parboil/benchmarks/llvm-40-34.py
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/DESCRIPTION b/hpvm/test/parboil/benchmarks/merge-tests/DESCRIPTION
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/DESCRIPTION
rename to hpvm/test/parboil/benchmarks/merge-tests/DESCRIPTION
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/Makefile b/hpvm/test/parboil/benchmarks/merge-tests/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/Makefile
rename to hpvm/test/parboil/benchmarks/merge-tests/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2DLeaf/Makefile b/hpvm/test/parboil/benchmarks/merge-tests/src/2DLeaf/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2DLeaf/Makefile
rename to hpvm/test/parboil/benchmarks/merge-tests/src/2DLeaf/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2DLeaf/io.cc b/hpvm/test/parboil/benchmarks/merge-tests/src/2DLeaf/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2DLeaf/io.cc
rename to hpvm/test/parboil/benchmarks/merge-tests/src/2DLeaf/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2DLeaf/main.cc b/hpvm/test/parboil/benchmarks/merge-tests/src/2DLeaf/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2DLeaf/main.cc
rename to hpvm/test/parboil/benchmarks/merge-tests/src/2DLeaf/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2ILeaf/Makefile b/hpvm/test/parboil/benchmarks/merge-tests/src/2ILeaf/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2ILeaf/Makefile
rename to hpvm/test/parboil/benchmarks/merge-tests/src/2ILeaf/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2ILeaf/io.cc b/hpvm/test/parboil/benchmarks/merge-tests/src/2ILeaf/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2ILeaf/io.cc
rename to hpvm/test/parboil/benchmarks/merge-tests/src/2ILeaf/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2ILeaf/main.cc b/hpvm/test/parboil/benchmarks/merge-tests/src/2ILeaf/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2ILeaf/main.cc
rename to hpvm/test/parboil/benchmarks/merge-tests/src/2ILeaf/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2ILeafD/Makefile b/hpvm/test/parboil/benchmarks/merge-tests/src/2ILeafD/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2ILeafD/Makefile
rename to hpvm/test/parboil/benchmarks/merge-tests/src/2ILeafD/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2ILeafD/io.cc b/hpvm/test/parboil/benchmarks/merge-tests/src/2ILeafD/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2ILeafD/io.cc
rename to hpvm/test/parboil/benchmarks/merge-tests/src/2ILeafD/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2ILeafD/main.cc b/hpvm/test/parboil/benchmarks/merge-tests/src/2ILeafD/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2ILeafD/main.cc
rename to hpvm/test/parboil/benchmarks/merge-tests/src/2ILeafD/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2ILeafS/Makefile b/hpvm/test/parboil/benchmarks/merge-tests/src/2ILeafS/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2ILeafS/Makefile
rename to hpvm/test/parboil/benchmarks/merge-tests/src/2ILeafS/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2ILeafS/io.cc b/hpvm/test/parboil/benchmarks/merge-tests/src/2ILeafS/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2ILeafS/io.cc
rename to hpvm/test/parboil/benchmarks/merge-tests/src/2ILeafS/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2ILeafS/main.cc b/hpvm/test/parboil/benchmarks/merge-tests/src/2ILeafS/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2ILeafS/main.cc
rename to hpvm/test/parboil/benchmarks/merge-tests/src/2ILeafS/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelACAC/Makefile b/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelACAC/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelACAC/Makefile
rename to hpvm/test/parboil/benchmarks/merge-tests/src/2LevelACAC/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelACAC/io.cc b/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelACAC/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelACAC/io.cc
rename to hpvm/test/parboil/benchmarks/merge-tests/src/2LevelACAC/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelACAC/main.cc b/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelACAC/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelACAC/main.cc
rename to hpvm/test/parboil/benchmarks/merge-tests/src/2LevelACAC/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelACC/Makefile b/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelACC/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelACC/Makefile
rename to hpvm/test/parboil/benchmarks/merge-tests/src/2LevelACC/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelACC/io.cc b/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelACC/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelACC/io.cc
rename to hpvm/test/parboil/benchmarks/merge-tests/src/2LevelACC/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelACC/main.cc b/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelACC/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelACC/main.cc
rename to hpvm/test/parboil/benchmarks/merge-tests/src/2LevelACC/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelCAC/Makefile b/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelCAC/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelCAC/Makefile
rename to hpvm/test/parboil/benchmarks/merge-tests/src/2LevelCAC/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelCAC/io.cc b/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelCAC/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelCAC/io.cc
rename to hpvm/test/parboil/benchmarks/merge-tests/src/2LevelCAC/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelCAC/main.cc b/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelCAC/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelCAC/main.cc
rename to hpvm/test/parboil/benchmarks/merge-tests/src/2LevelCAC/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelCC/Makefile b/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelCC/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelCC/Makefile
rename to hpvm/test/parboil/benchmarks/merge-tests/src/2LevelCC/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelCC/io.cc b/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelCC/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelCC/io.cc
rename to hpvm/test/parboil/benchmarks/merge-tests/src/2LevelCC/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelCC/main.cc b/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelCC/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelCC/main.cc
rename to hpvm/test/parboil/benchmarks/merge-tests/src/2LevelCC/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelICC/Makefile b/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelICC/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelICC/Makefile
rename to hpvm/test/parboil/benchmarks/merge-tests/src/2LevelICC/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelICC/io.cc b/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelICC/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelICC/io.cc
rename to hpvm/test/parboil/benchmarks/merge-tests/src/2LevelICC/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelICC/main.cc b/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelICC/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/src/2LevelICC/main.cc
rename to hpvm/test/parboil/benchmarks/merge-tests/src/2LevelICC/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/tools/compare-output b/hpvm/test/parboil/benchmarks/merge-tests/tools/compare-output
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/merge-tests/tools/compare-output
rename to hpvm/test/parboil/benchmarks/merge-tests/tools/compare-output
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/DESCRIPTION b/hpvm/test/parboil/benchmarks/mri-gridding/DESCRIPTION
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/DESCRIPTION
rename to hpvm/test/parboil/benchmarks/mri-gridding/DESCRIPTION
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/base/CPU_kernels.c b/hpvm/test/parboil/benchmarks/mri-gridding/src/base/CPU_kernels.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/base/CPU_kernels.c
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/base/CPU_kernels.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/base/CPU_kernels.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/base/CPU_kernels.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/base/CPU_kernels.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/base/CPU_kernels.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/base/Makefile b/hpvm/test/parboil/benchmarks/mri-gridding/src/base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/base/Makefile
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/base/UDTypes.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/base/UDTypes.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/base/UDTypes.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/base/UDTypes.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/base/main.c b/hpvm/test/parboil/benchmarks/mri-gridding/src/base/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/base/main.c
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/base/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/CPU_kernels.c b/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/CPU_kernels.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/CPU_kernels.c
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/CPU_kernels.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/CPU_kernels.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/CPU_kernels.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/CPU_kernels.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/CPU_kernels.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/CUDA_interface.cu b/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/CUDA_interface.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/CUDA_interface.cu
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/CUDA_interface.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/CUDA_interface.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/CUDA_interface.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/CUDA_interface.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/CUDA_interface.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/GPU_kernels.cu b/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/GPU_kernels.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/GPU_kernels.cu
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/GPU_kernels.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/Makefile b/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/Makefile
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/UDTypes.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/UDTypes.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/UDTypes.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/UDTypes.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/main.cu b/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/main.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/main.cu
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/main.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/scanLargeArray.cu b/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/scanLargeArray.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/scanLargeArray.cu
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/scanLargeArray.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/scanLargeArray.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/scanLargeArray.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/scanLargeArray.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/scanLargeArray.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/sort.cu b/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/sort.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/sort.cu
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/sort.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/sort.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/sort.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/sort.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/cuda-base/sort.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/CPU_kernels.c b/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/CPU_kernels.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/CPU_kernels.c
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/CPU_kernels.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/CPU_kernels.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/CPU_kernels.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/CPU_kernels.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/CPU_kernels.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/CUDA_interface.cu b/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/CUDA_interface.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/CUDA_interface.cu
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/CUDA_interface.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/CUDA_interface.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/CUDA_interface.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/CUDA_interface.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/CUDA_interface.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/GPU_kernels.cu b/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/GPU_kernels.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/GPU_kernels.cu
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/GPU_kernels.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/Makefile b/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/Makefile
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/UDTypes.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/UDTypes.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/UDTypes.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/UDTypes.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/main.cu b/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/main.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/main.cu
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/main.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/scanLargeArray.cu b/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/scanLargeArray.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/scanLargeArray.cu
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/scanLargeArray.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/scanLargeArray.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/scanLargeArray.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/scanLargeArray.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/scanLargeArray.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/sort.cu b/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/sort.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/sort.cu
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/sort.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/sort.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/sort.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/sort.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/cuda/sort.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/omp_base/CPU_kernels.c b/hpvm/test/parboil/benchmarks/mri-gridding/src/omp_base/CPU_kernels.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/omp_base/CPU_kernels.c
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/omp_base/CPU_kernels.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/omp_base/CPU_kernels.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/omp_base/CPU_kernels.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/omp_base/CPU_kernels.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/omp_base/CPU_kernels.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/omp_base/Makefile b/hpvm/test/parboil/benchmarks/mri-gridding/src/omp_base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/omp_base/Makefile
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/omp_base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/omp_base/UDTypes.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/omp_base/UDTypes.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/omp_base/UDTypes.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/omp_base/UDTypes.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/omp_base/main.c b/hpvm/test/parboil/benchmarks/mri-gridding/src/omp_base/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/omp_base/main.c
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/omp_base/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/CPU_kernels.c b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/CPU_kernels.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/CPU_kernels.c
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/CPU_kernels.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/CPU_kernels.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/CPU_kernels.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/CPU_kernels.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/CPU_kernels.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/GPU_kernels.cl b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/GPU_kernels.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/GPU_kernels.cl
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/GPU_kernels.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/Makefile b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/Makefile
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_common.cpp b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_common.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_common.cpp
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_common.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_common.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_common.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_common.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_common.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_interface.cpp b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_interface.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_interface.cpp
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_interface.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_interface.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_interface.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_interface.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/OpenCL_interface.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/UDTypes.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/UDTypes.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/UDTypes.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/UDTypes.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/main.cpp b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/main.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/main.cpp
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/main.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/scanLargeArray.cl b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/scanLargeArray.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/scanLargeArray.cl
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/scanLargeArray.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/scanLargeArray.cpp b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/scanLargeArray.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/scanLargeArray.cpp
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/scanLargeArray.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/scanLargeArray.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/scanLargeArray.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/scanLargeArray.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/scanLargeArray.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/sort.cl b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/sort.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/sort.cl
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/sort.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/sort.cpp b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/sort.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/sort.cpp
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/sort.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/sort.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/sort.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/sort.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_base/sort.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/CPU_kernels.c b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/CPU_kernels.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/CPU_kernels.c
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/CPU_kernels.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/CPU_kernels.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/CPU_kernels.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/CPU_kernels.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/CPU_kernels.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/GPU_kernels.cl b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/GPU_kernels.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/GPU_kernels.cl
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/GPU_kernels.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/Makefile b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/Makefile
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_common.cpp b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_common.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_common.cpp
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_common.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_common.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_common.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_common.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_common.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_interface.cpp b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_interface.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_interface.cpp
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_interface.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_interface.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_interface.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_interface.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/OpenCL_interface.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/UDTypes.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/UDTypes.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/UDTypes.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/UDTypes.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/main.cpp b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/main.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/main.cpp
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/main.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/scanLargeArray.cl b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/scanLargeArray.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/scanLargeArray.cl
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/scanLargeArray.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/scanLargeArray.cpp b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/scanLargeArray.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/scanLargeArray.cpp
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/scanLargeArray.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/scanLargeArray.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/scanLargeArray.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/scanLargeArray.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/scanLargeArray.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/sort.cl b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/sort.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/sort.cl
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/sort.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/sort.cpp b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/sort.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/sort.cpp
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/sort.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/sort.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/sort.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/sort.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/opencl_nvidia/sort.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/CPU_kernels.c b/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/CPU_kernels.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/CPU_kernels.c
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/visc/CPU_kernels.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/CPU_kernels.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/CPU_kernels.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/CPU_kernels.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/visc/CPU_kernels.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/GPU_kernels.cl b/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/GPU_kernels.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/GPU_kernels.cl
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/visc/GPU_kernels.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/Makefile b/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/Makefile
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/visc/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/OpenCL_common.cpp b/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/OpenCL_common.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/OpenCL_common.cpp
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/visc/OpenCL_common.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/OpenCL_common.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/OpenCL_common.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/OpenCL_common.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/visc/OpenCL_common.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/OpenCL_interface.cpp b/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/OpenCL_interface.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/OpenCL_interface.cpp
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/visc/OpenCL_interface.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/OpenCL_interface.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/OpenCL_interface.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/OpenCL_interface.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/visc/OpenCL_interface.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/UDTypes.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/UDTypes.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/UDTypes.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/visc/UDTypes.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/main.cpp b/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/main.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/main.cpp
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/visc/main.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/scanLargeArray.cl b/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/scanLargeArray.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/scanLargeArray.cl
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/visc/scanLargeArray.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/scanLargeArray.cpp b/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/scanLargeArray.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/scanLargeArray.cpp
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/visc/scanLargeArray.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/scanLargeArray.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/scanLargeArray.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/scanLargeArray.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/visc/scanLargeArray.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/sort.cl b/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/sort.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/sort.cl
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/visc/sort.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/sort.cpp b/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/sort.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/sort.cpp
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/visc/sort.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/sort.h b/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/sort.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/src/visc/sort.h
rename to hpvm/test/parboil/benchmarks/mri-gridding/src/visc/sort.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/tools/compare-output b/hpvm/test/parboil/benchmarks/mri-gridding/tools/compare-output
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-gridding/tools/compare-output
rename to hpvm/test/parboil/benchmarks/mri-gridding/tools/compare-output
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/DESCRIPTION b/hpvm/test/parboil/benchmarks/mri-q/DESCRIPTION
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/DESCRIPTION
rename to hpvm/test/parboil/benchmarks/mri-q/DESCRIPTION
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/Makefile b/hpvm/test/parboil/benchmarks/mri-q/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/Makefile
rename to hpvm/test/parboil/benchmarks/mri-q/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/recycle/base/Makefile b/hpvm/test/parboil/benchmarks/mri-q/recycle/base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/recycle/base/Makefile
rename to hpvm/test/parboil/benchmarks/mri-q/recycle/base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/recycle/base/computeQ.cc b/hpvm/test/parboil/benchmarks/mri-q/recycle/base/computeQ.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/recycle/base/computeQ.cc
rename to hpvm/test/parboil/benchmarks/mri-q/recycle/base/computeQ.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/recycle/base/file.cc b/hpvm/test/parboil/benchmarks/mri-q/recycle/base/file.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/recycle/base/file.cc
rename to hpvm/test/parboil/benchmarks/mri-q/recycle/base/file.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/recycle/base/file.h b/hpvm/test/parboil/benchmarks/mri-q/recycle/base/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/recycle/base/file.h
rename to hpvm/test/parboil/benchmarks/mri-q/recycle/base/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/recycle/base/main.c b/hpvm/test/parboil/benchmarks/mri-q/recycle/base/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/recycle/base/main.c
rename to hpvm/test/parboil/benchmarks/mri-q/recycle/base/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/cpu/Makefile b/hpvm/test/parboil/benchmarks/mri-q/src/cpu/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/cpu/Makefile
rename to hpvm/test/parboil/benchmarks/mri-q/src/cpu/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/cpu/computeQ.cc b/hpvm/test/parboil/benchmarks/mri-q/src/cpu/computeQ.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/cpu/computeQ.cc
rename to hpvm/test/parboil/benchmarks/mri-q/src/cpu/computeQ.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/cpu/file.cc b/hpvm/test/parboil/benchmarks/mri-q/src/cpu/file.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/cpu/file.cc
rename to hpvm/test/parboil/benchmarks/mri-q/src/cpu/file.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/cpu/file.h b/hpvm/test/parboil/benchmarks/mri-q/src/cpu/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/cpu/file.h
rename to hpvm/test/parboil/benchmarks/mri-q/src/cpu/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/cpu/main.c b/hpvm/test/parboil/benchmarks/mri-q/src/cpu/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/cpu/main.c
rename to hpvm/test/parboil/benchmarks/mri-q/src/cpu/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/cuda/Makefile b/hpvm/test/parboil/benchmarks/mri-q/src/cuda/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/cuda/Makefile
rename to hpvm/test/parboil/benchmarks/mri-q/src/cuda/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/cuda/computeQ.cu b/hpvm/test/parboil/benchmarks/mri-q/src/cuda/computeQ.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/cuda/computeQ.cu
rename to hpvm/test/parboil/benchmarks/mri-q/src/cuda/computeQ.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/cuda/file.cc b/hpvm/test/parboil/benchmarks/mri-q/src/cuda/file.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/cuda/file.cc
rename to hpvm/test/parboil/benchmarks/mri-q/src/cuda/file.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/cuda/file.h b/hpvm/test/parboil/benchmarks/mri-q/src/cuda/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/cuda/file.h
rename to hpvm/test/parboil/benchmarks/mri-q/src/cuda/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/cuda/main.cu b/hpvm/test/parboil/benchmarks/mri-q/src/cuda/main.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/cuda/main.cu
rename to hpvm/test/parboil/benchmarks/mri-q/src/cuda/main.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/omp_base/Makefile b/hpvm/test/parboil/benchmarks/mri-q/src/omp_base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/omp_base/Makefile
rename to hpvm/test/parboil/benchmarks/mri-q/src/omp_base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/omp_base/computeQ.cc b/hpvm/test/parboil/benchmarks/mri-q/src/omp_base/computeQ.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/omp_base/computeQ.cc
rename to hpvm/test/parboil/benchmarks/mri-q/src/omp_base/computeQ.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/omp_base/file.cc b/hpvm/test/parboil/benchmarks/mri-q/src/omp_base/file.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/omp_base/file.cc
rename to hpvm/test/parboil/benchmarks/mri-q/src/omp_base/file.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/omp_base/file.h b/hpvm/test/parboil/benchmarks/mri-q/src/omp_base/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/omp_base/file.h
rename to hpvm/test/parboil/benchmarks/mri-q/src/omp_base/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/omp_base/main.c b/hpvm/test/parboil/benchmarks/mri-q/src/omp_base/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/omp_base/main.c
rename to hpvm/test/parboil/benchmarks/mri-q/src/omp_base/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl/Makefile b/hpvm/test/parboil/benchmarks/mri-q/src/opencl/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl/Makefile
rename to hpvm/test/parboil/benchmarks/mri-q/src/opencl/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl/computeQ.c b/hpvm/test/parboil/benchmarks/mri-q/src/opencl/computeQ.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl/computeQ.c
rename to hpvm/test/parboil/benchmarks/mri-q/src/opencl/computeQ.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl/computeQ.h b/hpvm/test/parboil/benchmarks/mri-q/src/opencl/computeQ.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl/computeQ.h
rename to hpvm/test/parboil/benchmarks/mri-q/src/opencl/computeQ.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl/file.cc b/hpvm/test/parboil/benchmarks/mri-q/src/opencl/file.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl/file.cc
rename to hpvm/test/parboil/benchmarks/mri-q/src/opencl/file.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl/file.h b/hpvm/test/parboil/benchmarks/mri-q/src/opencl/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl/file.h
rename to hpvm/test/parboil/benchmarks/mri-q/src/opencl/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl/kernels.cl b/hpvm/test/parboil/benchmarks/mri-q/src/opencl/kernels.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl/kernels.cl
rename to hpvm/test/parboil/benchmarks/mri-q/src/opencl/kernels.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl/macros.h b/hpvm/test/parboil/benchmarks/mri-q/src/opencl/macros.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl/macros.h
rename to hpvm/test/parboil/benchmarks/mri-q/src/opencl/macros.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl/main.c b/hpvm/test/parboil/benchmarks/mri-q/src/opencl/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl/main.c
rename to hpvm/test/parboil/benchmarks/mri-q/src/opencl/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl/ocl.c b/hpvm/test/parboil/benchmarks/mri-q/src/opencl/ocl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl/ocl.c
rename to hpvm/test/parboil/benchmarks/mri-q/src/opencl/ocl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl/ocl.h b/hpvm/test/parboil/benchmarks/mri-q/src/opencl/ocl.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl/ocl.h
rename to hpvm/test/parboil/benchmarks/mri-q/src/opencl/ocl.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/Makefile b/hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/Makefile
rename to hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/computeQ.c b/hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/computeQ.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/computeQ.c
rename to hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/computeQ.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/computeQ.h b/hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/computeQ.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/computeQ.h
rename to hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/computeQ.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/file.cc b/hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/file.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/file.cc
rename to hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/file.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/file.h b/hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/file.h
rename to hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/kernels.cl b/hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/kernels.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/kernels.cl
rename to hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/kernels.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/macros.h b/hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/macros.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/macros.h
rename to hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/macros.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/main.c b/hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/main.c
rename to hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/ocl.c b/hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/ocl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/ocl.c
rename to hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/ocl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/ocl.h b/hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/ocl.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/ocl.h
rename to hpvm/test/parboil/benchmarks/mri-q/src/opencl_nvidia/ocl.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/visc/Makefile b/hpvm/test/parboil/benchmarks/mri-q/src/visc/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/visc/Makefile
rename to hpvm/test/parboil/benchmarks/mri-q/src/visc/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/visc/macros.h b/hpvm/test/parboil/benchmarks/mri-q/src/visc/macros.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/src/visc/macros.h
rename to hpvm/test/parboil/benchmarks/mri-q/src/visc/macros.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/mri-q/tools/compare-output b/hpvm/test/parboil/benchmarks/mri-q/tools/compare-output
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/mri-q/tools/compare-output
rename to hpvm/test/parboil/benchmarks/mri-q/tools/compare-output
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/nodeSwap/Makefile b/hpvm/test/parboil/benchmarks/nodeSwap/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/nodeSwap/Makefile
rename to hpvm/test/parboil/benchmarks/nodeSwap/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/nodeSwap/src/opencl/Makefile b/hpvm/test/parboil/benchmarks/nodeSwap/src/opencl/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/nodeSwap/src/opencl/Makefile
rename to hpvm/test/parboil/benchmarks/nodeSwap/src/opencl/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/nodeSwap/src/opencl/io.cc b/hpvm/test/parboil/benchmarks/nodeSwap/src/opencl/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/nodeSwap/src/opencl/io.cc
rename to hpvm/test/parboil/benchmarks/nodeSwap/src/opencl/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/nodeSwap/src/opencl/kernel.cl b/hpvm/test/parboil/benchmarks/nodeSwap/src/opencl/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/nodeSwap/src/opencl/kernel.cl
rename to hpvm/test/parboil/benchmarks/nodeSwap/src/opencl/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/nodeSwap/src/opencl/kernel_offline.cl b/hpvm/test/parboil/benchmarks/nodeSwap/src/opencl/kernel_offline.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/nodeSwap/src/opencl/kernel_offline.cl
rename to hpvm/test/parboil/benchmarks/nodeSwap/src/opencl/kernel_offline.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/nodeSwap/src/opencl/main.cc b/hpvm/test/parboil/benchmarks/nodeSwap/src/opencl/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/nodeSwap/src/opencl/main.cc
rename to hpvm/test/parboil/benchmarks/nodeSwap/src/opencl/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/nodeSwap/tools/compare-output b/hpvm/test/parboil/benchmarks/nodeSwap/tools/compare-output
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/nodeSwap/tools/compare-output
rename to hpvm/test/parboil/benchmarks/nodeSwap/tools/compare-output
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/DESCRIPTION b/hpvm/test/parboil/benchmarks/pipeline/DESCRIPTION
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/DESCRIPTION
rename to hpvm/test/parboil/benchmarks/pipeline/DESCRIPTION
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/Makefile b/hpvm/test/parboil/benchmarks/pipeline/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/Makefile
rename to hpvm/test/parboil/benchmarks/pipeline/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/copyToVersions.sh b/hpvm/test/parboil/benchmarks/pipeline/copyToVersions.sh
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/copyToVersions.sh
rename to hpvm/test/parboil/benchmarks/pipeline/copyToVersions.sh
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/gradient.visc.merged.experiments.notimer.ll b/hpvm/test/parboil/benchmarks/pipeline/gradient.visc.merged.experiments.notimer.ll
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/gradient.visc.merged.experiments.notimer.ll
rename to hpvm/test/parboil/benchmarks/pipeline/gradient.visc.merged.experiments.notimer.ll
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/laplacian.visc.merged.experiments.notimer.ll b/hpvm/test/parboil/benchmarks/pipeline/laplacian.visc.merged.experiments.notimer.ll
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/laplacian.visc.merged.experiments.notimer.ll
rename to hpvm/test/parboil/benchmarks/pipeline/laplacian.visc.merged.experiments.notimer.ll
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/run.sh b/hpvm/test/parboil/benchmarks/pipeline/run.sh
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/run.sh
rename to hpvm/test/parboil/benchmarks/pipeline/run.sh
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/runscript.sh b/hpvm/test/parboil/benchmarks/pipeline/runscript.sh
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/runscript.sh
rename to hpvm/test/parboil/benchmarks/pipeline/runscript.sh
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/Gradient/Makefile b/hpvm/test/parboil/benchmarks/pipeline/src/Gradient/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/Gradient/Makefile
rename to hpvm/test/parboil/benchmarks/pipeline/src/Gradient/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/Gradient/io.cc b/hpvm/test/parboil/benchmarks/pipeline/src/Gradient/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/Gradient/io.cc
rename to hpvm/test/parboil/benchmarks/pipeline/src/Gradient/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/Gradient/main.cc b/hpvm/test/parboil/benchmarks/pipeline/src/Gradient/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/Gradient/main.cc
rename to hpvm/test/parboil/benchmarks/pipeline/src/Gradient/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/GradientMerged/Makefile b/hpvm/test/parboil/benchmarks/pipeline/src/GradientMerged/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/GradientMerged/Makefile
rename to hpvm/test/parboil/benchmarks/pipeline/src/GradientMerged/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/GradientMerged/io.cc b/hpvm/test/parboil/benchmarks/pipeline/src/GradientMerged/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/GradientMerged/io.cc
rename to hpvm/test/parboil/benchmarks/pipeline/src/GradientMerged/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/GradientMerged/main.cc b/hpvm/test/parboil/benchmarks/pipeline/src/GradientMerged/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/GradientMerged/main.cc
rename to hpvm/test/parboil/benchmarks/pipeline/src/GradientMerged/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/Laplacian/Makefile b/hpvm/test/parboil/benchmarks/pipeline/src/Laplacian/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/Laplacian/Makefile
rename to hpvm/test/parboil/benchmarks/pipeline/src/Laplacian/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/Laplacian/io.cc b/hpvm/test/parboil/benchmarks/pipeline/src/Laplacian/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/Laplacian/io.cc
rename to hpvm/test/parboil/benchmarks/pipeline/src/Laplacian/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/Laplacian/main.cc b/hpvm/test/parboil/benchmarks/pipeline/src/Laplacian/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/Laplacian/main.cc
rename to hpvm/test/parboil/benchmarks/pipeline/src/Laplacian/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/LaplacianMerged/Makefile b/hpvm/test/parboil/benchmarks/pipeline/src/LaplacianMerged/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/LaplacianMerged/Makefile
rename to hpvm/test/parboil/benchmarks/pipeline/src/LaplacianMerged/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/LaplacianMerged/io.cc b/hpvm/test/parboil/benchmarks/pipeline/src/LaplacianMerged/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/LaplacianMerged/io.cc
rename to hpvm/test/parboil/benchmarks/pipeline/src/LaplacianMerged/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/LaplacianMerged/main.cc b/hpvm/test/parboil/benchmarks/pipeline/src/LaplacianMerged/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/LaplacianMerged/main.cc
rename to hpvm/test/parboil/benchmarks/pipeline/src/LaplacianMerged/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/visc/Makefile b/hpvm/test/parboil/benchmarks/pipeline/src/visc/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/visc/Makefile
rename to hpvm/test/parboil/benchmarks/pipeline/src/visc/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/visc/io.cc b/hpvm/test/parboil/benchmarks/pipeline/src/visc/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/visc/io.cc
rename to hpvm/test/parboil/benchmarks/pipeline/src/visc/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/visc/kernel.cl b/hpvm/test/parboil/benchmarks/pipeline/src/visc/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/visc/kernel.cl
rename to hpvm/test/parboil/benchmarks/pipeline/src/visc/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/visc/main.cc b/hpvm/test/parboil/benchmarks/pipeline/src/visc/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/visc/main.cc
rename to hpvm/test/parboil/benchmarks/pipeline/src/visc/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/visc/main.cc.pldi b/hpvm/test/parboil/benchmarks/pipeline/src/visc/main.cc.pldi
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/visc/main.cc.pldi
rename to hpvm/test/parboil/benchmarks/pipeline/src/visc/main.cc.pldi
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/visc/main_demo.cc b/hpvm/test/parboil/benchmarks/pipeline/src/visc/main_demo.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/visc/main_demo.cc
rename to hpvm/test/parboil/benchmarks/pipeline/src/visc/main_demo.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscGPU-Scalar-MaxG/Makefile b/hpvm/test/parboil/benchmarks/pipeline/src/viscGPU-Scalar-MaxG/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscGPU-Scalar-MaxG/Makefile
rename to hpvm/test/parboil/benchmarks/pipeline/src/viscGPU-Scalar-MaxG/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscGPU-Scalar-MaxG/io.cc b/hpvm/test/parboil/benchmarks/pipeline/src/viscGPU-Scalar-MaxG/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscGPU-Scalar-MaxG/io.cc
rename to hpvm/test/parboil/benchmarks/pipeline/src/viscGPU-Scalar-MaxG/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscGPU-Scalar-MaxG/main.cc b/hpvm/test/parboil/benchmarks/pipeline/src/viscGPU-Scalar-MaxG/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscGPU-Scalar-MaxG/main.cc
rename to hpvm/test/parboil/benchmarks/pipeline/src/viscGPU-Scalar-MaxG/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscGPU-Scalar-ZC/Makefile b/hpvm/test/parboil/benchmarks/pipeline/src/viscGPU-Scalar-ZC/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscGPU-Scalar-ZC/Makefile
rename to hpvm/test/parboil/benchmarks/pipeline/src/viscGPU-Scalar-ZC/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscGPU-Scalar-ZC/io.cc b/hpvm/test/parboil/benchmarks/pipeline/src/viscGPU-Scalar-ZC/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscGPU-Scalar-ZC/io.cc
rename to hpvm/test/parboil/benchmarks/pipeline/src/viscGPU-Scalar-ZC/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscGPU-Scalar-ZC/main.cc b/hpvm/test/parboil/benchmarks/pipeline/src/viscGPU-Scalar-ZC/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscGPU-Scalar-ZC/main.cc
rename to hpvm/test/parboil/benchmarks/pipeline/src/viscGPU-Scalar-ZC/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscGPU/Makefile b/hpvm/test/parboil/benchmarks/pipeline/src/viscGPU/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscGPU/Makefile
rename to hpvm/test/parboil/benchmarks/pipeline/src/viscGPU/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscGPU/io.cc b/hpvm/test/parboil/benchmarks/pipeline/src/viscGPU/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscGPU/io.cc
rename to hpvm/test/parboil/benchmarks/pipeline/src/viscGPU/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscGPU/main.cc b/hpvm/test/parboil/benchmarks/pipeline/src/viscGPU/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscGPU/main.cc
rename to hpvm/test/parboil/benchmarks/pipeline/src/viscGPU/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscScalar/Makefile b/hpvm/test/parboil/benchmarks/pipeline/src/viscScalar/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscScalar/Makefile
rename to hpvm/test/parboil/benchmarks/pipeline/src/viscScalar/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscScalar/io.cc b/hpvm/test/parboil/benchmarks/pipeline/src/viscScalar/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscScalar/io.cc
rename to hpvm/test/parboil/benchmarks/pipeline/src/viscScalar/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscScalar/main.cc b/hpvm/test/parboil/benchmarks/pipeline/src/viscScalar/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscScalar/main.cc
rename to hpvm/test/parboil/benchmarks/pipeline/src/viscScalar/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscVector-Scalar-MaxG/Makefile b/hpvm/test/parboil/benchmarks/pipeline/src/viscVector-Scalar-MaxG/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscVector-Scalar-MaxG/Makefile
rename to hpvm/test/parboil/benchmarks/pipeline/src/viscVector-Scalar-MaxG/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscVector-Scalar-MaxG/io.cc b/hpvm/test/parboil/benchmarks/pipeline/src/viscVector-Scalar-MaxG/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscVector-Scalar-MaxG/io.cc
rename to hpvm/test/parboil/benchmarks/pipeline/src/viscVector-Scalar-MaxG/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscVector-Scalar-MaxG/main.cc b/hpvm/test/parboil/benchmarks/pipeline/src/viscVector-Scalar-MaxG/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscVector-Scalar-MaxG/main.cc
rename to hpvm/test/parboil/benchmarks/pipeline/src/viscVector-Scalar-MaxG/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscVector-Scalar-ZC/Makefile b/hpvm/test/parboil/benchmarks/pipeline/src/viscVector-Scalar-ZC/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscVector-Scalar-ZC/Makefile
rename to hpvm/test/parboil/benchmarks/pipeline/src/viscVector-Scalar-ZC/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscVector-Scalar-ZC/io.cc b/hpvm/test/parboil/benchmarks/pipeline/src/viscVector-Scalar-ZC/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscVector-Scalar-ZC/io.cc
rename to hpvm/test/parboil/benchmarks/pipeline/src/viscVector-Scalar-ZC/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscVector-Scalar-ZC/main.cc b/hpvm/test/parboil/benchmarks/pipeline/src/viscVector-Scalar-ZC/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscVector-Scalar-ZC/main.cc
rename to hpvm/test/parboil/benchmarks/pipeline/src/viscVector-Scalar-ZC/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscVector/Makefile b/hpvm/test/parboil/benchmarks/pipeline/src/viscVector/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscVector/Makefile
rename to hpvm/test/parboil/benchmarks/pipeline/src/viscVector/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscVector/io.cc b/hpvm/test/parboil/benchmarks/pipeline/src/viscVector/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscVector/io.cc
rename to hpvm/test/parboil/benchmarks/pipeline/src/viscVector/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscVector/main.cc b/hpvm/test/parboil/benchmarks/pipeline/src/viscVector/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/viscVector/main.cc
rename to hpvm/test/parboil/benchmarks/pipeline/src/viscVector/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/visc_demo/Makefile b/hpvm/test/parboil/benchmarks/pipeline/src/visc_demo/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/visc_demo/Makefile
rename to hpvm/test/parboil/benchmarks/pipeline/src/visc_demo/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/visc_demo/io.cc b/hpvm/test/parboil/benchmarks/pipeline/src/visc_demo/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/visc_demo/io.cc
rename to hpvm/test/parboil/benchmarks/pipeline/src/visc_demo/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/visc_demo/main.cc b/hpvm/test/parboil/benchmarks/pipeline/src/visc_demo/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/visc_demo/main.cc
rename to hpvm/test/parboil/benchmarks/pipeline/src/visc_demo/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/visc_parallel/Makefile b/hpvm/test/parboil/benchmarks/pipeline/src/visc_parallel/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/visc_parallel/Makefile
rename to hpvm/test/parboil/benchmarks/pipeline/src/visc_parallel/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/visc_parallel/io.cc b/hpvm/test/parboil/benchmarks/pipeline/src/visc_parallel/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/visc_parallel/io.cc
rename to hpvm/test/parboil/benchmarks/pipeline/src/visc_parallel/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/visc_parallel/main.cc b/hpvm/test/parboil/benchmarks/pipeline/src/visc_parallel/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/src/visc_parallel/main.cc
rename to hpvm/test/parboil/benchmarks/pipeline/src/visc_parallel/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/pipeline/tools/compare-output b/hpvm/test/parboil/benchmarks/pipeline/tools/compare-output
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/pipeline/tools/compare-output
rename to hpvm/test/parboil/benchmarks/pipeline/tools/compare-output
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/DESCRIPTION b/hpvm/test/parboil/benchmarks/sad/DESCRIPTION
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/DESCRIPTION
rename to hpvm/test/parboil/benchmarks/sad/DESCRIPTION
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/Makefile b/hpvm/test/parboil/benchmarks/sad/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/Makefile
rename to hpvm/test/parboil/benchmarks/sad/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/base/Makefile b/hpvm/test/parboil/benchmarks/sad/src/base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/base/Makefile
rename to hpvm/test/parboil/benchmarks/sad/src/base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/base/file.c b/hpvm/test/parboil/benchmarks/sad/src/base/file.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/base/file.c
rename to hpvm/test/parboil/benchmarks/sad/src/base/file.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/base/file.h b/hpvm/test/parboil/benchmarks/sad/src/base/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/base/file.h
rename to hpvm/test/parboil/benchmarks/sad/src/base/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/base/image.c b/hpvm/test/parboil/benchmarks/sad/src/base/image.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/base/image.c
rename to hpvm/test/parboil/benchmarks/sad/src/base/image.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/base/image.h b/hpvm/test/parboil/benchmarks/sad/src/base/image.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/base/image.h
rename to hpvm/test/parboil/benchmarks/sad/src/base/image.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/base/main.c b/hpvm/test/parboil/benchmarks/sad/src/base/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/base/main.c
rename to hpvm/test/parboil/benchmarks/sad/src/base/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/base/sad.h b/hpvm/test/parboil/benchmarks/sad/src/base/sad.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/base/sad.h
rename to hpvm/test/parboil/benchmarks/sad/src/base/sad.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/base/sad_cpu.c b/hpvm/test/parboil/benchmarks/sad/src/base/sad_cpu.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/base/sad_cpu.c
rename to hpvm/test/parboil/benchmarks/sad/src/base/sad_cpu.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cpu/Makefile b/hpvm/test/parboil/benchmarks/sad/src/cpu/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cpu/Makefile
rename to hpvm/test/parboil/benchmarks/sad/src/cpu/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cpu/file.c b/hpvm/test/parboil/benchmarks/sad/src/cpu/file.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cpu/file.c
rename to hpvm/test/parboil/benchmarks/sad/src/cpu/file.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cpu/file.h b/hpvm/test/parboil/benchmarks/sad/src/cpu/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cpu/file.h
rename to hpvm/test/parboil/benchmarks/sad/src/cpu/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cpu/image.c b/hpvm/test/parboil/benchmarks/sad/src/cpu/image.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cpu/image.c
rename to hpvm/test/parboil/benchmarks/sad/src/cpu/image.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cpu/image.h b/hpvm/test/parboil/benchmarks/sad/src/cpu/image.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cpu/image.h
rename to hpvm/test/parboil/benchmarks/sad/src/cpu/image.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cpu/main.c b/hpvm/test/parboil/benchmarks/sad/src/cpu/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cpu/main.c
rename to hpvm/test/parboil/benchmarks/sad/src/cpu/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cpu/sad.h b/hpvm/test/parboil/benchmarks/sad/src/cpu/sad.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cpu/sad.h
rename to hpvm/test/parboil/benchmarks/sad/src/cpu/sad.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cpu/sad_cpu.c b/hpvm/test/parboil/benchmarks/sad/src/cpu/sad_cpu.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cpu/sad_cpu.c
rename to hpvm/test/parboil/benchmarks/sad/src/cpu/sad_cpu.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda/Makefile b/hpvm/test/parboil/benchmarks/sad/src/cuda/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda/Makefile
rename to hpvm/test/parboil/benchmarks/sad/src/cuda/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda/file.c b/hpvm/test/parboil/benchmarks/sad/src/cuda/file.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda/file.c
rename to hpvm/test/parboil/benchmarks/sad/src/cuda/file.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda/file.h b/hpvm/test/parboil/benchmarks/sad/src/cuda/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda/file.h
rename to hpvm/test/parboil/benchmarks/sad/src/cuda/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda/image.c b/hpvm/test/parboil/benchmarks/sad/src/cuda/image.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda/image.c
rename to hpvm/test/parboil/benchmarks/sad/src/cuda/image.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda/image.h b/hpvm/test/parboil/benchmarks/sad/src/cuda/image.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda/image.h
rename to hpvm/test/parboil/benchmarks/sad/src/cuda/image.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda/largerBlocks.cu b/hpvm/test/parboil/benchmarks/sad/src/cuda/largerBlocks.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda/largerBlocks.cu
rename to hpvm/test/parboil/benchmarks/sad/src/cuda/largerBlocks.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda/largerBlocks.h b/hpvm/test/parboil/benchmarks/sad/src/cuda/largerBlocks.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda/largerBlocks.h
rename to hpvm/test/parboil/benchmarks/sad/src/cuda/largerBlocks.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda/main.cu b/hpvm/test/parboil/benchmarks/sad/src/cuda/main.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda/main.cu
rename to hpvm/test/parboil/benchmarks/sad/src/cuda/main.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda/sad.h b/hpvm/test/parboil/benchmarks/sad/src/cuda/sad.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda/sad.h
rename to hpvm/test/parboil/benchmarks/sad/src/cuda/sad.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda/sad4.cu b/hpvm/test/parboil/benchmarks/sad/src/cuda/sad4.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda/sad4.cu
rename to hpvm/test/parboil/benchmarks/sad/src/cuda/sad4.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda/sad4.h b/hpvm/test/parboil/benchmarks/sad/src/cuda/sad4.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda/sad4.h
rename to hpvm/test/parboil/benchmarks/sad/src/cuda/sad4.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda_base/Makefile b/hpvm/test/parboil/benchmarks/sad/src/cuda_base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda_base/Makefile
rename to hpvm/test/parboil/benchmarks/sad/src/cuda_base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda_base/file.c b/hpvm/test/parboil/benchmarks/sad/src/cuda_base/file.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda_base/file.c
rename to hpvm/test/parboil/benchmarks/sad/src/cuda_base/file.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda_base/file.h b/hpvm/test/parboil/benchmarks/sad/src/cuda_base/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda_base/file.h
rename to hpvm/test/parboil/benchmarks/sad/src/cuda_base/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda_base/image.c b/hpvm/test/parboil/benchmarks/sad/src/cuda_base/image.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda_base/image.c
rename to hpvm/test/parboil/benchmarks/sad/src/cuda_base/image.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda_base/image.h b/hpvm/test/parboil/benchmarks/sad/src/cuda_base/image.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda_base/image.h
rename to hpvm/test/parboil/benchmarks/sad/src/cuda_base/image.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda_base/largerBlocks.cu b/hpvm/test/parboil/benchmarks/sad/src/cuda_base/largerBlocks.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda_base/largerBlocks.cu
rename to hpvm/test/parboil/benchmarks/sad/src/cuda_base/largerBlocks.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda_base/largerBlocks.h b/hpvm/test/parboil/benchmarks/sad/src/cuda_base/largerBlocks.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda_base/largerBlocks.h
rename to hpvm/test/parboil/benchmarks/sad/src/cuda_base/largerBlocks.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda_base/main.cu b/hpvm/test/parboil/benchmarks/sad/src/cuda_base/main.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda_base/main.cu
rename to hpvm/test/parboil/benchmarks/sad/src/cuda_base/main.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda_base/sad.h b/hpvm/test/parboil/benchmarks/sad/src/cuda_base/sad.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda_base/sad.h
rename to hpvm/test/parboil/benchmarks/sad/src/cuda_base/sad.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda_base/sad4.cu b/hpvm/test/parboil/benchmarks/sad/src/cuda_base/sad4.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda_base/sad4.cu
rename to hpvm/test/parboil/benchmarks/sad/src/cuda_base/sad4.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda_base/sad4.h b/hpvm/test/parboil/benchmarks/sad/src/cuda_base/sad4.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/cuda_base/sad4.h
rename to hpvm/test/parboil/benchmarks/sad/src/cuda_base/sad4.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_base/Makefile b/hpvm/test/parboil/benchmarks/sad/src/opencl_base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_base/Makefile
rename to hpvm/test/parboil/benchmarks/sad/src/opencl_base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_base/OpenCL_common.cpp b/hpvm/test/parboil/benchmarks/sad/src/opencl_base/OpenCL_common.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_base/OpenCL_common.cpp
rename to hpvm/test/parboil/benchmarks/sad/src/opencl_base/OpenCL_common.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_base/OpenCL_common.h b/hpvm/test/parboil/benchmarks/sad/src/opencl_base/OpenCL_common.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_base/OpenCL_common.h
rename to hpvm/test/parboil/benchmarks/sad/src/opencl_base/OpenCL_common.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_base/file.c b/hpvm/test/parboil/benchmarks/sad/src/opencl_base/file.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_base/file.c
rename to hpvm/test/parboil/benchmarks/sad/src/opencl_base/file.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_base/file.h b/hpvm/test/parboil/benchmarks/sad/src/opencl_base/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_base/file.h
rename to hpvm/test/parboil/benchmarks/sad/src/opencl_base/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_base/image.c b/hpvm/test/parboil/benchmarks/sad/src/opencl_base/image.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_base/image.c
rename to hpvm/test/parboil/benchmarks/sad/src/opencl_base/image.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_base/image.h b/hpvm/test/parboil/benchmarks/sad/src/opencl_base/image.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_base/image.h
rename to hpvm/test/parboil/benchmarks/sad/src/opencl_base/image.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_base/main.cpp b/hpvm/test/parboil/benchmarks/sad/src/opencl_base/main.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_base/main.cpp
rename to hpvm/test/parboil/benchmarks/sad/src/opencl_base/main.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_base/sad.h b/hpvm/test/parboil/benchmarks/sad/src/opencl_base/sad.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_base/sad.h
rename to hpvm/test/parboil/benchmarks/sad/src/opencl_base/sad.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_base/sad_kernel.cl b/hpvm/test/parboil/benchmarks/sad/src/opencl_base/sad_kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_base/sad_kernel.cl
rename to hpvm/test/parboil/benchmarks/sad/src/opencl_base/sad_kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_base/sad_kernel.h b/hpvm/test/parboil/benchmarks/sad/src/opencl_base/sad_kernel.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_base/sad_kernel.h
rename to hpvm/test/parboil/benchmarks/sad/src/opencl_base/sad_kernel.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/Makefile b/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/Makefile
rename to hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/OpenCL_common.cpp b/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/OpenCL_common.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/OpenCL_common.cpp
rename to hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/OpenCL_common.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/OpenCL_common.h b/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/OpenCL_common.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/OpenCL_common.h
rename to hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/OpenCL_common.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/file.c b/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/file.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/file.c
rename to hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/file.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/file.h b/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/file.h
rename to hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/image.c b/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/image.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/image.c
rename to hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/image.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/image.h b/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/image.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/image.h
rename to hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/image.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/main.cpp b/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/main.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/main.cpp
rename to hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/main.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/main_debug.cpp b/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/main_debug.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/main_debug.cpp
rename to hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/main_debug.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/sad.h b/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/sad.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/sad.h
rename to hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/sad.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/sad_kernel.cl b/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/sad_kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/sad_kernel.cl
rename to hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/sad_kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/sad_kernel.h b/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/sad_kernel.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/sad_kernel.h
rename to hpvm/test/parboil/benchmarks/sad/src/opencl_nvidia/sad_kernel.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/visc/Makefile b/hpvm/test/parboil/benchmarks/sad/src/visc/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/visc/Makefile
rename to hpvm/test/parboil/benchmarks/sad/src/visc/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/visc/file.c b/hpvm/test/parboil/benchmarks/sad/src/visc/file.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/visc/file.c
rename to hpvm/test/parboil/benchmarks/sad/src/visc/file.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/visc/file.h b/hpvm/test/parboil/benchmarks/sad/src/visc/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/visc/file.h
rename to hpvm/test/parboil/benchmarks/sad/src/visc/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/visc/image.c b/hpvm/test/parboil/benchmarks/sad/src/visc/image.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/visc/image.c
rename to hpvm/test/parboil/benchmarks/sad/src/visc/image.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/visc/image.h b/hpvm/test/parboil/benchmarks/sad/src/visc/image.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/visc/image.h
rename to hpvm/test/parboil/benchmarks/sad/src/visc/image.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/visc/main.cpp b/hpvm/test/parboil/benchmarks/sad/src/visc/main.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/visc/main.cpp
rename to hpvm/test/parboil/benchmarks/sad/src/visc/main.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/visc/sad.h b/hpvm/test/parboil/benchmarks/sad/src/visc/sad.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/visc/sad.h
rename to hpvm/test/parboil/benchmarks/sad/src/visc/sad.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/visc/sad_kernel.cl b/hpvm/test/parboil/benchmarks/sad/src/visc/sad_kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/visc/sad_kernel.cl
rename to hpvm/test/parboil/benchmarks/sad/src/visc/sad_kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/src/visc/sad_kernel.h b/hpvm/test/parboil/benchmarks/sad/src/visc/sad_kernel.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/src/visc/sad_kernel.h
rename to hpvm/test/parboil/benchmarks/sad/src/visc/sad_kernel.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/tools/compare-output b/hpvm/test/parboil/benchmarks/sad/tools/compare-output
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/tools/compare-output
rename to hpvm/test/parboil/benchmarks/sad/tools/compare-output
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sad/tools/compute-one-sad.py b/hpvm/test/parboil/benchmarks/sad/tools/compute-one-sad.py
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sad/tools/compute-one-sad.py
rename to hpvm/test/parboil/benchmarks/sad/tools/compute-one-sad.py
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/saxpy_test/Makefile b/hpvm/test/parboil/benchmarks/saxpy_test/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/saxpy_test/Makefile
rename to hpvm/test/parboil/benchmarks/saxpy_test/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/saxpy_test/src/defs.h b/hpvm/test/parboil/benchmarks/saxpy_test/src/defs.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/saxpy_test/src/defs.h
rename to hpvm/test/parboil/benchmarks/saxpy_test/src/defs.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/saxpy_test/src/main.c b/hpvm/test/parboil/benchmarks/saxpy_test/src/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/saxpy_test/src/main.c
rename to hpvm/test/parboil/benchmarks/saxpy_test/src/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/saxpy_test/src/visc.h b/hpvm/test/parboil/benchmarks/saxpy_test/src/visc.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/saxpy_test/src/visc.h
rename to hpvm/test/parboil/benchmarks/saxpy_test/src/visc.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/DESCRIPTION b/hpvm/test/parboil/benchmarks/sgemm/DESCRIPTION
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/DESCRIPTION
rename to hpvm/test/parboil/benchmarks/sgemm/DESCRIPTION
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/Makefile b/hpvm/test/parboil/benchmarks/sgemm/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/Makefile
rename to hpvm/test/parboil/benchmarks/sgemm/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/base/Makefile b/hpvm/test/parboil/benchmarks/sgemm/src/base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/base/Makefile
rename to hpvm/test/parboil/benchmarks/sgemm/src/base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/base/io.cc b/hpvm/test/parboil/benchmarks/sgemm/src/base/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/base/io.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/base/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/base/main.cc b/hpvm/test/parboil/benchmarks/sgemm/src/base/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/base/main.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/base/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/base/sgemm_kernel.cc b/hpvm/test/parboil/benchmarks/sgemm/src/base/sgemm_kernel.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/base/sgemm_kernel.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/base/sgemm_kernel.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/cuda/Makefile b/hpvm/test/parboil/benchmarks/sgemm/src/cuda/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/cuda/Makefile
rename to hpvm/test/parboil/benchmarks/sgemm/src/cuda/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/cuda/io.cc b/hpvm/test/parboil/benchmarks/sgemm/src/cuda/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/cuda/io.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/cuda/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/cuda/main.cu b/hpvm/test/parboil/benchmarks/sgemm/src/cuda/main.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/cuda/main.cu
rename to hpvm/test/parboil/benchmarks/sgemm/src/cuda/main.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/cuda/sgemm_kernel.cu b/hpvm/test/parboil/benchmarks/sgemm/src/cuda/sgemm_kernel.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/cuda/sgemm_kernel.cu
rename to hpvm/test/parboil/benchmarks/sgemm/src/cuda/sgemm_kernel.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/cuda_base/Makefile b/hpvm/test/parboil/benchmarks/sgemm/src/cuda_base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/cuda_base/Makefile
rename to hpvm/test/parboil/benchmarks/sgemm/src/cuda_base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/cuda_base/io.cc b/hpvm/test/parboil/benchmarks/sgemm/src/cuda_base/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/cuda_base/io.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/cuda_base/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/cuda_base/main.cu b/hpvm/test/parboil/benchmarks/sgemm/src/cuda_base/main.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/cuda_base/main.cu
rename to hpvm/test/parboil/benchmarks/sgemm/src/cuda_base/main.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/cuda_base/sgemm_kernel.cu b/hpvm/test/parboil/benchmarks/sgemm/src/cuda_base/sgemm_kernel.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/cuda_base/sgemm_kernel.cu
rename to hpvm/test/parboil/benchmarks/sgemm/src/cuda_base/sgemm_kernel.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/omp_base/Makefile b/hpvm/test/parboil/benchmarks/sgemm/src/omp_base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/omp_base/Makefile
rename to hpvm/test/parboil/benchmarks/sgemm/src/omp_base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/omp_base/io.cc b/hpvm/test/parboil/benchmarks/sgemm/src/omp_base/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/omp_base/io.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/omp_base/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/omp_base/main.cc b/hpvm/test/parboil/benchmarks/sgemm/src/omp_base/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/omp_base/main.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/omp_base/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/omp_base/sgemm_kernel.cc b/hpvm/test/parboil/benchmarks/sgemm/src/omp_base/sgemm_kernel.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/omp_base/sgemm_kernel.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/omp_base/sgemm_kernel.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base/Makefile b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base/Makefile
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base/io.cc b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base/io.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_base/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base/kernel.cl b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base/kernel.cl
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_base/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base/kernel_offline.cl b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base/kernel_offline.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base/kernel_offline.cl
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_base/kernel_offline.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base/main.cc b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base/main.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_base/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_opt/Makefile b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_opt/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_opt/Makefile
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_opt/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_opt/io.cc b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_opt/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_opt/io.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_opt/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_opt/kernel.cl b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_opt/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_opt/kernel.cl
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_opt/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_opt/main.cc b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_opt/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_opt/main.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_opt/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_vec/Makefile b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_vec/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_vec/Makefile
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_vec/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_vec/io.cc b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_vec/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_vec/io.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_vec/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_vec/kernel.cl b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_vec/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_vec/kernel.cl
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_vec/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_vec/kernel_offline.cl b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_vec/kernel_offline.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_vec/kernel_offline.cl
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_vec/kernel_offline.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_vec/main.cc b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_vec/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_vec/main.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_base_vec/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu/Makefile b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu/Makefile
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu/io.cc b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu/io.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu/kernel.cl b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu/kernel.cl
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu/kernel_offline.cl b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu/kernel_offline.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu/kernel_offline.cl
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu/kernel_offline.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu/main.cc b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu/main.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/Makefile b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/Makefile
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/io.cc b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/io.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel.cl b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel.cl
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel.ir b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel.ir
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel.ir
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel.ir
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel.ll b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel.ll
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel.ll
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel.ll
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel_offline.cl b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel_offline.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel_offline.cl
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/kernel_offline.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/main.cc b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/main.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_4K/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/Makefile b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/Makefile
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/io.cc b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/io.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/kernel.cl b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/kernel.cl
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/kernel_offline.cl b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/kernel_offline.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/kernel_offline.cl
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/kernel_offline.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/main.cc b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/main.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_baseline/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/Makefile b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/Makefile
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/io.cc b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/io.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel.cl b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel.cl
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel.ir b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel.ir
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel.ir
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel.ir
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel.ll b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel.ll
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel.ll
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel.ll
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel_offline.cl b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel_offline.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel_offline.cl
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/kernel_offline.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/main.cc b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/main.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_medium/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/Makefile b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/Makefile
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/io.cc b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/io.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/kernel-spir64.ll b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/kernel-spir64.ll
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/kernel-spir64.ll
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/kernel-spir64.ll
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/kernel.cl b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/kernel.cl
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/kernel.ll b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/kernel.ll
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/kernel.ll
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/kernel.ll
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/main.cc b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/main.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/test-spir64.ll b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/test-spir64.ll
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/test-spir64.ll
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/test-spir64.ll
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/test.cl b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/test.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/test.cl
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/test.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/test.ll b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/test.ll
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/test.ll
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_cpu_sm/test.ll
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_nvidia/Makefile b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_nvidia/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_nvidia/Makefile
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_nvidia/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_nvidia/io.cc b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_nvidia/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_nvidia/io.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_nvidia/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_nvidia/kernel.cl b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_nvidia/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_nvidia/kernel.cl
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_nvidia/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_nvidia/main.cc b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_nvidia/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_nvidia/main.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_nvidia/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8/Makefile b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8/Makefile
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8/io.cc b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8/io.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8/kernel.cl b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8/kernel.cl
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8/main.cc b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8/main.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/Makefile b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/Makefile
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/io.cc b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/io.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/kernel.cl b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/kernel.cl
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/main.cc b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/main.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_4K/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/Makefile b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/Makefile
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/io.cc b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/io.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/kernel.cl b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/kernel.cl
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/main.cc b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/main.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_medium/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/Makefile b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/Makefile
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/io.cc b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/io.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/kernel.cl b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/kernel.cl
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/main.cc b/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/main.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/opencl_opt_8_vec/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc/Makefile b/hpvm/test/parboil/benchmarks/sgemm/src/visc/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc/Makefile
rename to hpvm/test/parboil/benchmarks/sgemm/src/visc/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc/io.cc b/hpvm/test/parboil/benchmarks/sgemm/src/visc/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc/io.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/visc/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc/kernel.cl b/hpvm/test/parboil/benchmarks/sgemm/src/visc/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc/kernel.cl
rename to hpvm/test/parboil/benchmarks/sgemm/src/visc/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc/main.cc b/hpvm/test/parboil/benchmarks/sgemm/src/visc/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc/main.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/visc/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_opt/Makefile b/hpvm/test/parboil/benchmarks/sgemm/src/visc_opt/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_opt/Makefile
rename to hpvm/test/parboil/benchmarks/sgemm/src/visc_opt/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_opt/io.cc b/hpvm/test/parboil/benchmarks/sgemm/src/visc_opt/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_opt/io.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/visc_opt/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_opt/kernel.cl b/hpvm/test/parboil/benchmarks/sgemm/src/visc_opt/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_opt/kernel.cl
rename to hpvm/test/parboil/benchmarks/sgemm/src/visc_opt/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_opt/main.cc b/hpvm/test/parboil/benchmarks/sgemm/src/visc_opt/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_opt/main.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/visc_opt/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_sh/Makefile b/hpvm/test/parboil/benchmarks/sgemm/src/visc_sh/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_sh/Makefile
rename to hpvm/test/parboil/benchmarks/sgemm/src/visc_sh/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_sh/io.cc b/hpvm/test/parboil/benchmarks/sgemm/src/visc_sh/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_sh/io.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/visc_sh/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_sh/main.cc b/hpvm/test/parboil/benchmarks/sgemm/src/visc_sh/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_sh/main.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/visc_sh/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_tc/Makefile b/hpvm/test/parboil/benchmarks/sgemm/src/visc_tc/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_tc/Makefile
rename to hpvm/test/parboil/benchmarks/sgemm/src/visc_tc/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_tc/io.cc b/hpvm/test/parboil/benchmarks/sgemm/src/visc_tc/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_tc/io.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/visc_tc/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_tc/main.cc b/hpvm/test/parboil/benchmarks/sgemm/src/visc_tc/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_tc/main.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/visc_tc/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_tc_vec/Makefile b/hpvm/test/parboil/benchmarks/sgemm/src/visc_tc_vec/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_tc_vec/Makefile
rename to hpvm/test/parboil/benchmarks/sgemm/src/visc_tc_vec/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_tc_vec/io.cc b/hpvm/test/parboil/benchmarks/sgemm/src/visc_tc_vec/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_tc_vec/io.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/visc_tc_vec/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_tc_vec/main.cc b/hpvm/test/parboil/benchmarks/sgemm/src/visc_tc_vec/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_tc_vec/main.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/visc_tc_vec/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_tc_vec/main.visc.ll b/hpvm/test/parboil/benchmarks/sgemm/src/visc_tc_vec/main.visc.ll
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_tc_vec/main.visc.ll
rename to hpvm/test/parboil/benchmarks/sgemm/src/visc_tc_vec/main.visc.ll
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_vec/Makefile b/hpvm/test/parboil/benchmarks/sgemm/src/visc_vec/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_vec/Makefile
rename to hpvm/test/parboil/benchmarks/sgemm/src/visc_vec/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_vec/io.cc b/hpvm/test/parboil/benchmarks/sgemm/src/visc_vec/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_vec/io.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/visc_vec/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_vec/kernel.cl b/hpvm/test/parboil/benchmarks/sgemm/src/visc_vec/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_vec/kernel.cl
rename to hpvm/test/parboil/benchmarks/sgemm/src/visc_vec/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_vec/main.cc b/hpvm/test/parboil/benchmarks/sgemm/src/visc_vec/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_vec/main.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/visc_vec/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_vec/main.visc.ll b/hpvm/test/parboil/benchmarks/sgemm/src/visc_vec/main.visc.ll
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_vec/main.visc.ll
rename to hpvm/test/parboil/benchmarks/sgemm/src/visc_vec/main.visc.ll
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_vec_opt/Makefile b/hpvm/test/parboil/benchmarks/sgemm/src/visc_vec_opt/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_vec_opt/Makefile
rename to hpvm/test/parboil/benchmarks/sgemm/src/visc_vec_opt/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_vec_opt/io.cc b/hpvm/test/parboil/benchmarks/sgemm/src/visc_vec_opt/io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_vec_opt/io.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/visc_vec_opt/io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_vec_opt/kernel.cl b/hpvm/test/parboil/benchmarks/sgemm/src/visc_vec_opt/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_vec_opt/kernel.cl
rename to hpvm/test/parboil/benchmarks/sgemm/src/visc_vec_opt/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_vec_opt/main.cc b/hpvm/test/parboil/benchmarks/sgemm/src/visc_vec_opt/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_vec_opt/main.cc
rename to hpvm/test/parboil/benchmarks/sgemm/src/visc_vec_opt/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_vec_opt/main.visc.ll b/hpvm/test/parboil/benchmarks/sgemm/src/visc_vec_opt/main.visc.ll
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/src/visc_vec_opt/main.visc.ll
rename to hpvm/test/parboil/benchmarks/sgemm/src/visc_vec_opt/main.visc.ll
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/sgemm/tools/compare-output b/hpvm/test/parboil/benchmarks/sgemm/tools/compare-output
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/sgemm/tools/compare-output
rename to hpvm/test/parboil/benchmarks/sgemm/tools/compare-output
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/DESCRIPTION b/hpvm/test/parboil/benchmarks/spmv/DESCRIPTION
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/DESCRIPTION
rename to hpvm/test/parboil/benchmarks/spmv/DESCRIPTION
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/Makefile b/hpvm/test/parboil/benchmarks/spmv/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/Makefile
rename to hpvm/test/parboil/benchmarks/spmv/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/Makefile b/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/Makefile
rename to hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/bcsstk32.mtx b/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/bcsstk32.mtx
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/bcsstk32.mtx
rename to hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/bcsstk32.mtx
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/commontools.mk b/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/commontools.mk
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/commontools.mk
rename to hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/commontools.mk
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/convert_dataset.c b/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/convert_dataset.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/convert_dataset.c
rename to hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/convert_dataset.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/convert_dataset.h b/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/convert_dataset.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/convert_dataset.h
rename to hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/convert_dataset.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/fidapm05.mtx b/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/fidapm05.mtx
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/fidapm05.mtx
rename to hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/fidapm05.mtx
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/fidapm05_rhs1.mtx b/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/fidapm05_rhs1.mtx
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/fidapm05_rhs1.mtx
rename to hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/fidapm05_rhs1.mtx
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/jgl009.mtx b/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/jgl009.mtx
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/jgl009.mtx
rename to hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/jgl009.mtx
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/mmio.c b/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/mmio.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/mmio.c
rename to hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/mmio.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/mmio.h b/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/mmio.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/mmio.h
rename to hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/mmio.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/test.c b/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/test.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/test.c
rename to hpvm/test/parboil/benchmarks/spmv/common_src/convert-dataset/test.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cpu/Makefile b/hpvm/test/parboil/benchmarks/spmv/src/cpu/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cpu/Makefile
rename to hpvm/test/parboil/benchmarks/spmv/src/cpu/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cpu/file.c b/hpvm/test/parboil/benchmarks/spmv/src/cpu/file.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cpu/file.c
rename to hpvm/test/parboil/benchmarks/spmv/src/cpu/file.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cpu/file.h b/hpvm/test/parboil/benchmarks/spmv/src/cpu/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cpu/file.h
rename to hpvm/test/parboil/benchmarks/spmv/src/cpu/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cpu/main.c b/hpvm/test/parboil/benchmarks/spmv/src/cpu/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cpu/main.c
rename to hpvm/test/parboil/benchmarks/spmv/src/cpu/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda/Makefile b/hpvm/test/parboil/benchmarks/spmv/src/cuda/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda/Makefile
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda/file.cc b/hpvm/test/parboil/benchmarks/spmv/src/cuda/file.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda/file.cc
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda/file.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda/file.h b/hpvm/test/parboil/benchmarks/spmv/src/cuda/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda/file.h
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda/gpu_info.cc b/hpvm/test/parboil/benchmarks/spmv/src/cuda/gpu_info.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda/gpu_info.cc
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda/gpu_info.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda/gpu_info.h b/hpvm/test/parboil/benchmarks/spmv/src/cuda/gpu_info.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda/gpu_info.h
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda/gpu_info.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda/jds_kernels.cu b/hpvm/test/parboil/benchmarks/spmv/src/cuda/jds_kernels.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda/jds_kernels.cu
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda/jds_kernels.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda/main.cu b/hpvm/test/parboil/benchmarks/spmv/src/cuda/main.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda/main.cu
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda/main.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda/spmv_jds.h b/hpvm/test/parboil/benchmarks/spmv/src/cuda/spmv_jds.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda/spmv_jds.h
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda/spmv_jds.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base/Makefile b/hpvm/test/parboil/benchmarks/spmv/src/cuda_base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base/Makefile
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda_base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base/file.cc b/hpvm/test/parboil/benchmarks/spmv/src/cuda_base/file.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base/file.cc
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda_base/file.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base/file.h b/hpvm/test/parboil/benchmarks/spmv/src/cuda_base/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base/file.h
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda_base/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base/gpu_info.cc b/hpvm/test/parboil/benchmarks/spmv/src/cuda_base/gpu_info.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base/gpu_info.cc
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda_base/gpu_info.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base/gpu_info.h b/hpvm/test/parboil/benchmarks/spmv/src/cuda_base/gpu_info.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base/gpu_info.h
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda_base/gpu_info.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base/jds_kernels.cu b/hpvm/test/parboil/benchmarks/spmv/src/cuda_base/jds_kernels.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base/jds_kernels.cu
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda_base/jds_kernels.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base/main.cu b/hpvm/test/parboil/benchmarks/spmv/src/cuda_base/main.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base/main.cu
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda_base/main.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base/spmv_jds.h b/hpvm/test/parboil/benchmarks/spmv/src/cuda_base/spmv_jds.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base/spmv_jds.h
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda_base/spmv_jds.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/Makefile b/hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/Makefile
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/file.cc b/hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/file.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/file.cc
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/file.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/file.h b/hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/file.h
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/gpu_info.cc b/hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/gpu_info.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/gpu_info.cc
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/gpu_info.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/gpu_info.h b/hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/gpu_info.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/gpu_info.h
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/gpu_info.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/jds_kernels.cu b/hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/jds_kernels.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/jds_kernels.cu
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/jds_kernels.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/main.cu b/hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/main.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/main.cu
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/main.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/spmv_jds.h b/hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/spmv_jds.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/spmv_jds.h
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda_base_tex/spmv_jds.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/Makefile b/hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/Makefile
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/file.cc b/hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/file.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/file.cc
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/file.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/file.h b/hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/file.h
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/gpu_info.cc b/hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/gpu_info.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/gpu_info.cc
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/gpu_info.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/gpu_info.h b/hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/gpu_info.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/gpu_info.h
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/gpu_info.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/jds_kernels.cu b/hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/jds_kernels.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/jds_kernels.cu
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/jds_kernels.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/main.cu b/hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/main.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/main.cu
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/main.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/spmv_jds.h b/hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/spmv_jds.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/spmv_jds.h
rename to hpvm/test/parboil/benchmarks/spmv/src/cuda_tex/spmv_jds.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/omp_base/Makefile b/hpvm/test/parboil/benchmarks/spmv/src/omp_base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/omp_base/Makefile
rename to hpvm/test/parboil/benchmarks/spmv/src/omp_base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/omp_base/file.c b/hpvm/test/parboil/benchmarks/spmv/src/omp_base/file.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/omp_base/file.c
rename to hpvm/test/parboil/benchmarks/spmv/src/omp_base/file.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/omp_base/file.h b/hpvm/test/parboil/benchmarks/spmv/src/omp_base/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/omp_base/file.h
rename to hpvm/test/parboil/benchmarks/spmv/src/omp_base/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/omp_base/main.c b/hpvm/test/parboil/benchmarks/spmv/src/omp_base/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/omp_base/main.c
rename to hpvm/test/parboil/benchmarks/spmv/src/omp_base/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/Makefile b/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/Makefile
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/file.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/file.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/file.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/file.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/file.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/file.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/gpu_info.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/gpu_info.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/gpu_info.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/gpu_info.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/gpu_info.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/gpu_info.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/gpu_info.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/gpu_info.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/kernel.cl b/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/kernel.cl
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/main.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/main.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/ocl.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/ocl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/ocl.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/ocl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/ocl.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/ocl.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/ocl.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/ocl.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/readme.txt b/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/readme.txt
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/readme.txt
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_ati/readme.txt
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/Makefile b/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/Makefile
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/file.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/file.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/file.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/file.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/file.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/file.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/gpu_info.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/gpu_info.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/gpu_info.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/gpu_info.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/gpu_info.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/gpu_info.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/gpu_info.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/gpu_info.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/kernel.cl b/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/kernel.cl
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/main.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/main.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/ocl.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/ocl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/ocl.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/ocl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/ocl.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/ocl.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/ocl.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/ocl.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/readme.txt b/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/readme.txt
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/readme.txt
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_ati_vec/readme.txt
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_base/Makefile b/hpvm/test/parboil/benchmarks/spmv/src/opencl_base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_base/Makefile
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_base/file.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_base/file.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_base/file.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_base/file.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_base/file.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_base/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_base/file.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_base/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_base/gpu_info.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_base/gpu_info.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_base/gpu_info.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_base/gpu_info.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_base/gpu_info.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_base/gpu_info.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_base/gpu_info.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_base/gpu_info.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_base/kernel.cl b/hpvm/test/parboil/benchmarks/spmv/src/opencl_base/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_base/kernel.cl
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_base/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_base/main.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_base/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_base/main.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_base/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_base/ocl.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_base/ocl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_base/ocl.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_base/ocl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_base/ocl.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_base/ocl.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_base/ocl.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_base/ocl.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/Makefile b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/Makefile
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/file.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/file.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/file.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/file.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/file.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/file.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/gpu_info.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/gpu_info.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/gpu_info.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/gpu_info.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/gpu_info.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/gpu_info.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/gpu_info.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/gpu_info.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/kernel.cl b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/kernel.cl
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/main.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/main.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/ocl.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/ocl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/ocl.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/ocl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/ocl.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/ocl.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/ocl.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu/ocl.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/Makefile b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/Makefile
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/file.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/file.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/file.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/file.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/file.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/file.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/gpu_info.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/gpu_info.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/gpu_info.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/gpu_info.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/gpu_info.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/gpu_info.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/gpu_info.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/gpu_info.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/kernel.cl b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/kernel.cl
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/main.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/main.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/ocl.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/ocl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/ocl.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/ocl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/ocl.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/ocl.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/ocl.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_baseline/ocl.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/Makefile b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/Makefile
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/file.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/file.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/file.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/file.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/file.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/file.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/gpu_info.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/gpu_info.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/gpu_info.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/gpu_info.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/gpu_info.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/gpu_info.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/gpu_info.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/gpu_info.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/kernel.cl b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/kernel.cl
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/kernel.ir b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/kernel.ir
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/kernel.ir
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/kernel.ir
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/main.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/main.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/ocl.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/ocl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/ocl.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/ocl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/ocl.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/ocl.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/ocl.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_huge/ocl.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/Makefile b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/Makefile
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/file.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/file.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/file.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/file.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/file.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/file.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/gpu_info.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/gpu_info.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/gpu_info.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/gpu_info.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/gpu_info.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/gpu_info.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/gpu_info.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/gpu_info.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/kernel.cl b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/kernel.cl
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/kernel.ir b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/kernel.ir
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/kernel.ir
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/kernel.ir
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/main.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/main.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/ocl.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/ocl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/ocl.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/ocl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/ocl.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/ocl.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/ocl.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_cpu_large/ocl.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/Makefile b/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/Makefile
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/file.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/file.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/file.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/file.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/file.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/file.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/gpu_info.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/gpu_info.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/gpu_info.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/gpu_info.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/gpu_info.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/gpu_info.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/gpu_info.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/gpu_info.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/kernel.cl b/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/kernel.cl
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/kernel_offline.cl b/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/kernel_offline.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/kernel_offline.cl
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/kernel_offline.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/main.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/main.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/ocl.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/ocl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/ocl.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/ocl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/ocl.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/ocl.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/ocl.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia/ocl.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/Makefile b/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/Makefile
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/file.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/file.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/file.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/file.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/file.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/file.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/gpu_info.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/gpu_info.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/gpu_info.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/gpu_info.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/gpu_info.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/gpu_info.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/gpu_info.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/gpu_info.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/kernel.cl b/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/kernel.cl
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/kernel_offline.cl b/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/kernel_offline.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/kernel_offline.cl
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/kernel_offline.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/main.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/main.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/ocl.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/ocl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/ocl.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/ocl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/ocl.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/ocl.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/ocl.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_huge/ocl.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/Makefile b/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/Makefile
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/file.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/file.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/file.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/file.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/file.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/file.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/gpu_info.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/gpu_info.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/gpu_info.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/gpu_info.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/gpu_info.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/gpu_info.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/gpu_info.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/gpu_info.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/kernel.cl b/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/kernel.cl
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/kernel_offline.cl b/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/kernel_offline.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/kernel_offline.cl
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/kernel_offline.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/main.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/main.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/ocl.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/ocl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/ocl.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/ocl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/ocl.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/ocl.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/ocl.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_nvidia_large/ocl.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/Makefile b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/Makefile
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/file.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/file.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/file.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/file.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/file.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/file.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/gpu_info.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/gpu_info.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/gpu_info.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/gpu_info.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/gpu_info.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/gpu_info.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/gpu_info.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/gpu_info.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/kernel.cl b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/kernel.cl
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/main.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/main.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/ocl.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/ocl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/ocl.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/ocl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/ocl.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/ocl.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/ocl.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex/ocl.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/Makefile b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/Makefile
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/file.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/file.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/file.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/file.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/file.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/file.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/gpu_info.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/gpu_info.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/gpu_info.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/gpu_info.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/gpu_info.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/gpu_info.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/gpu_info.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/gpu_info.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/kernel.cl b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/kernel.cl
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/main.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/main.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/ocl.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/ocl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/ocl.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/ocl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/ocl.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/ocl.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/ocl.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/ocl.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/Makefile b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/Makefile
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/file.cc b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/file.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/file.cc
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/file.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/file.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/file.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/gpu_info.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/gpu_info.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/gpu_info.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/gpu_info.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/gpu_info.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/gpu_info.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/gpu_info.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/gpu_info.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/kernel.cl b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/kernel.cl
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/main.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/main.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/ocl.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/ocl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/ocl.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/ocl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/ocl.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/ocl.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/ocl.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_base/ocl.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/Makefile b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/Makefile
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/file.cc b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/file.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/file.cc
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/file.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/file.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/file.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/gpu_info.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/gpu_info.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/gpu_info.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/gpu_info.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/gpu_info.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/gpu_info.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/gpu_info.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/gpu_info.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/kernel.cl b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/kernel.cl
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/main.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/main.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/ocl.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/ocl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/ocl.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/ocl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/ocl.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/ocl.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/ocl.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_nvidia/ocl.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/Makefile b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/Makefile
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/file.cc b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/file.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/file.cc
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/file.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/file.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/file.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/gpu_info.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/gpu_info.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/gpu_info.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/gpu_info.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/gpu_info.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/gpu_info.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/gpu_info.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/gpu_info.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/kernel.cl b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/kernel.cl
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/main.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/main.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/ocl.c b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/ocl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/ocl.c
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/ocl.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/ocl.h b/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/ocl.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/ocl.h
rename to hpvm/test/parboil/benchmarks/spmv/src/opencl_tex_nvidia/opencl_tex/ocl.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/visc/Makefile b/hpvm/test/parboil/benchmarks/spmv/src/visc/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/visc/Makefile
rename to hpvm/test/parboil/benchmarks/spmv/src/visc/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/visc/file.cpp b/hpvm/test/parboil/benchmarks/spmv/src/visc/file.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/visc/file.cpp
rename to hpvm/test/parboil/benchmarks/spmv/src/visc/file.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/visc/file.h b/hpvm/test/parboil/benchmarks/spmv/src/visc/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/visc/file.h
rename to hpvm/test/parboil/benchmarks/spmv/src/visc/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/visc/gpu_info.cpp b/hpvm/test/parboil/benchmarks/spmv/src/visc/gpu_info.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/visc/gpu_info.cpp
rename to hpvm/test/parboil/benchmarks/spmv/src/visc/gpu_info.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/visc/gpu_info.h b/hpvm/test/parboil/benchmarks/spmv/src/visc/gpu_info.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/visc/gpu_info.h
rename to hpvm/test/parboil/benchmarks/spmv/src/visc/gpu_info.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/visc/kernel.cl b/hpvm/test/parboil/benchmarks/spmv/src/visc/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/visc/kernel.cl
rename to hpvm/test/parboil/benchmarks/spmv/src/visc/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/visc/main.cpp b/hpvm/test/parboil/benchmarks/spmv/src/visc/main.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/visc/main.cpp
rename to hpvm/test/parboil/benchmarks/spmv/src/visc/main.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/visc/main.visc.ll.kernels.bc b/hpvm/test/parboil/benchmarks/spmv/src/visc/main.visc.ll.kernels.bc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/visc/main.visc.ll.kernels.bc
rename to hpvm/test/parboil/benchmarks/spmv/src/visc/main.visc.ll.kernels.bc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/visc/main.visc.ll.kernels.ll b/hpvm/test/parboil/benchmarks/spmv/src/visc/main.visc.ll.kernels.ll
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/src/visc/main.visc.ll.kernels.ll
rename to hpvm/test/parboil/benchmarks/spmv/src/visc/main.visc.ll.kernels.ll
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/tools/compare-output b/hpvm/test/parboil/benchmarks/spmv/tools/compare-output
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/tools/compare-output
rename to hpvm/test/parboil/benchmarks/spmv/tools/compare-output
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/spmv/vectorgen/vectorgen.cc b/hpvm/test/parboil/benchmarks/spmv/vectorgen/vectorgen.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/spmv/vectorgen/vectorgen.cc
rename to hpvm/test/parboil/benchmarks/spmv/vectorgen/vectorgen.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/DESCRIPTION b/hpvm/test/parboil/benchmarks/stencil/DESCRIPTION
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/DESCRIPTION
rename to hpvm/test/parboil/benchmarks/stencil/DESCRIPTION
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/Makefile b/hpvm/test/parboil/benchmarks/stencil/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/Makefile
rename to hpvm/test/parboil/benchmarks/stencil/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cpu/Makefile b/hpvm/test/parboil/benchmarks/stencil/src/cpu/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cpu/Makefile
rename to hpvm/test/parboil/benchmarks/stencil/src/cpu/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cpu/common.h b/hpvm/test/parboil/benchmarks/stencil/src/cpu/common.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cpu/common.h
rename to hpvm/test/parboil/benchmarks/stencil/src/cpu/common.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cpu/file.c b/hpvm/test/parboil/benchmarks/stencil/src/cpu/file.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cpu/file.c
rename to hpvm/test/parboil/benchmarks/stencil/src/cpu/file.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cpu/file.h b/hpvm/test/parboil/benchmarks/stencil/src/cpu/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cpu/file.h
rename to hpvm/test/parboil/benchmarks/stencil/src/cpu/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cpu/kernels.c b/hpvm/test/parboil/benchmarks/stencil/src/cpu/kernels.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cpu/kernels.c
rename to hpvm/test/parboil/benchmarks/stencil/src/cpu/kernels.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cpu/kernels.h b/hpvm/test/parboil/benchmarks/stencil/src/cpu/kernels.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cpu/kernels.h
rename to hpvm/test/parboil/benchmarks/stencil/src/cpu/kernels.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cpu/main.c b/hpvm/test/parboil/benchmarks/stencil/src/cpu/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cpu/main.c
rename to hpvm/test/parboil/benchmarks/stencil/src/cpu/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda/Makefile b/hpvm/test/parboil/benchmarks/stencil/src/cuda/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda/Makefile
rename to hpvm/test/parboil/benchmarks/stencil/src/cuda/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda/common.h b/hpvm/test/parboil/benchmarks/stencil/src/cuda/common.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda/common.h
rename to hpvm/test/parboil/benchmarks/stencil/src/cuda/common.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda/cuerr.h b/hpvm/test/parboil/benchmarks/stencil/src/cuda/cuerr.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda/cuerr.h
rename to hpvm/test/parboil/benchmarks/stencil/src/cuda/cuerr.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda/file.cc b/hpvm/test/parboil/benchmarks/stencil/src/cuda/file.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda/file.cc
rename to hpvm/test/parboil/benchmarks/stencil/src/cuda/file.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda/file.h b/hpvm/test/parboil/benchmarks/stencil/src/cuda/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda/file.h
rename to hpvm/test/parboil/benchmarks/stencil/src/cuda/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda/kernels.cu b/hpvm/test/parboil/benchmarks/stencil/src/cuda/kernels.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda/kernels.cu
rename to hpvm/test/parboil/benchmarks/stencil/src/cuda/kernels.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda/kernels.h b/hpvm/test/parboil/benchmarks/stencil/src/cuda/kernels.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda/kernels.h
rename to hpvm/test/parboil/benchmarks/stencil/src/cuda/kernels.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda/main.cu b/hpvm/test/parboil/benchmarks/stencil/src/cuda/main.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda/main.cu
rename to hpvm/test/parboil/benchmarks/stencil/src/cuda/main.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda_base/Makefile b/hpvm/test/parboil/benchmarks/stencil/src/cuda_base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda_base/Makefile
rename to hpvm/test/parboil/benchmarks/stencil/src/cuda_base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda_base/common.h b/hpvm/test/parboil/benchmarks/stencil/src/cuda_base/common.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda_base/common.h
rename to hpvm/test/parboil/benchmarks/stencil/src/cuda_base/common.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda_base/cuerr.h b/hpvm/test/parboil/benchmarks/stencil/src/cuda_base/cuerr.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda_base/cuerr.h
rename to hpvm/test/parboil/benchmarks/stencil/src/cuda_base/cuerr.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda_base/file.cc b/hpvm/test/parboil/benchmarks/stencil/src/cuda_base/file.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda_base/file.cc
rename to hpvm/test/parboil/benchmarks/stencil/src/cuda_base/file.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda_base/file.h b/hpvm/test/parboil/benchmarks/stencil/src/cuda_base/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda_base/file.h
rename to hpvm/test/parboil/benchmarks/stencil/src/cuda_base/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda_base/kernels.cu b/hpvm/test/parboil/benchmarks/stencil/src/cuda_base/kernels.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda_base/kernels.cu
rename to hpvm/test/parboil/benchmarks/stencil/src/cuda_base/kernels.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda_base/main.cu b/hpvm/test/parboil/benchmarks/stencil/src/cuda_base/main.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda_base/main.cu
rename to hpvm/test/parboil/benchmarks/stencil/src/cuda_base/main.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda_fermi/Makefile b/hpvm/test/parboil/benchmarks/stencil/src/cuda_fermi/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda_fermi/Makefile
rename to hpvm/test/parboil/benchmarks/stencil/src/cuda_fermi/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda_fermi/common.h b/hpvm/test/parboil/benchmarks/stencil/src/cuda_fermi/common.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda_fermi/common.h
rename to hpvm/test/parboil/benchmarks/stencil/src/cuda_fermi/common.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda_fermi/cuerr.h b/hpvm/test/parboil/benchmarks/stencil/src/cuda_fermi/cuerr.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda_fermi/cuerr.h
rename to hpvm/test/parboil/benchmarks/stencil/src/cuda_fermi/cuerr.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda_fermi/file.cc b/hpvm/test/parboil/benchmarks/stencil/src/cuda_fermi/file.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda_fermi/file.cc
rename to hpvm/test/parboil/benchmarks/stencil/src/cuda_fermi/file.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda_fermi/file.h b/hpvm/test/parboil/benchmarks/stencil/src/cuda_fermi/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda_fermi/file.h
rename to hpvm/test/parboil/benchmarks/stencil/src/cuda_fermi/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda_fermi/kernels.cu b/hpvm/test/parboil/benchmarks/stencil/src/cuda_fermi/kernels.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda_fermi/kernels.cu
rename to hpvm/test/parboil/benchmarks/stencil/src/cuda_fermi/kernels.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda_fermi/main.cu b/hpvm/test/parboil/benchmarks/stencil/src/cuda_fermi/main.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/cuda_fermi/main.cu
rename to hpvm/test/parboil/benchmarks/stencil/src/cuda_fermi/main.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/omp_base/Makefile b/hpvm/test/parboil/benchmarks/stencil/src/omp_base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/omp_base/Makefile
rename to hpvm/test/parboil/benchmarks/stencil/src/omp_base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/omp_base/common.h b/hpvm/test/parboil/benchmarks/stencil/src/omp_base/common.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/omp_base/common.h
rename to hpvm/test/parboil/benchmarks/stencil/src/omp_base/common.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/omp_base/file.c b/hpvm/test/parboil/benchmarks/stencil/src/omp_base/file.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/omp_base/file.c
rename to hpvm/test/parboil/benchmarks/stencil/src/omp_base/file.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/omp_base/file.h b/hpvm/test/parboil/benchmarks/stencil/src/omp_base/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/omp_base/file.h
rename to hpvm/test/parboil/benchmarks/stencil/src/omp_base/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/omp_base/kernels.c b/hpvm/test/parboil/benchmarks/stencil/src/omp_base/kernels.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/omp_base/kernels.c
rename to hpvm/test/parboil/benchmarks/stencil/src/omp_base/kernels.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/omp_base/kernels.h b/hpvm/test/parboil/benchmarks/stencil/src/omp_base/kernels.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/omp_base/kernels.h
rename to hpvm/test/parboil/benchmarks/stencil/src/omp_base/kernels.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/omp_base/main.c b/hpvm/test/parboil/benchmarks/stencil/src/omp_base/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/omp_base/main.c
rename to hpvm/test/parboil/benchmarks/stencil/src/omp_base/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base/Makefile b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base/Makefile
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base/common.h b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base/common.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base/common.h
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base/common.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base/file.cc b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base/file.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base/file.cc
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base/file.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base/file.h b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base/file.h
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base/kernel.cl b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base/kernel.cl
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base/kernel_offline.cl b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base/kernel_offline.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base/kernel_offline.cl
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base/kernel_offline.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base/main.c b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base/main.c
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_default/Makefile b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_default/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_default/Makefile
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_default/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_default/common.h b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_default/common.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_default/common.h
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_default/common.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_default/file.cc b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_default/file.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_default/file.cc
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_default/file.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_default/file.h b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_default/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_default/file.h
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_default/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_default/kernel.cl b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_default/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_default/kernel.cl
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_default/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_default/kernel_offline.cl b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_default/kernel_offline.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_default/kernel_offline.cl
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_default/kernel_offline.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_default/main.c b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_default/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_default/main.c
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_default/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_large/Makefile b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_large/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_large/Makefile
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_large/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_large/common.h b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_large/common.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_large/common.h
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_large/common.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_large/file.cc b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_large/file.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_large/file.cc
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_large/file.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_large/file.h b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_large/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_large/file.h
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_large/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_large/kernel.cl b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_large/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_large/kernel.cl
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_large/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_large/kernel_offline.cl b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_large/kernel_offline.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_large/kernel_offline.cl
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_large/kernel_offline.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_large/main.c b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_large/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_large/main.c
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_large/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_opt/Makefile b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_opt/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_opt/Makefile
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_opt/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_opt/common.h b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_opt/common.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_opt/common.h
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_opt/common.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_opt/file.cc b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_opt/file.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_opt/file.cc
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_opt/file.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_opt/file.h b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_opt/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_opt/file.h
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_opt/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_opt/kernel.cl b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_opt/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_opt/kernel.cl
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_opt/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_opt/main.c b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_opt/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_opt/main.c
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_opt/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_strided/Makefile b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_strided/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_strided/Makefile
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_strided/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_strided/common.h b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_strided/common.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_strided/common.h
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_strided/common.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_strided/file.cc b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_strided/file.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_strided/file.cc
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_strided/file.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_strided/file.h b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_strided/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_strided/file.h
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_strided/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_strided/kernel.cl b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_strided/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_strided/kernel.cl
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_strided/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_strided/kernel_offline.cl b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_strided/kernel_offline.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_strided/kernel_offline.cl
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_strided/kernel_offline.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_strided/main.c b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_strided/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_strided/main.c
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_strided/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_vec/Makefile b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_vec/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_vec/Makefile
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_vec/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_vec/common.h b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_vec/common.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_vec/common.h
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_vec/common.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_vec/file.cc b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_vec/file.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_vec/file.cc
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_vec/file.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_vec/file.h b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_vec/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_vec/file.h
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_vec/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_vec/kernel.cl b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_vec/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_vec/kernel.cl
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_vec/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_vec/kernel_offline.cl b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_vec/kernel_offline.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_vec/kernel_offline.cl
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_vec/kernel_offline.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_vec/main.c b/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_vec/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_base_vec/main.c
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_base_vec/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu/Makefile b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu/Makefile
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu/common.h b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu/common.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu/common.h
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu/common.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu/file.cc b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu/file.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu/file.cc
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu/file.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu/file.h b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu/file.h
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu/kernel.cl b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu/kernel.cl
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu/kernel_offline.cl b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu/kernel_offline.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu/kernel_offline.cl
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu/kernel_offline.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu/main.c b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu/main.c
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/Makefile b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/Makefile
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/common.h b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/common.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/common.h
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/common.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/file.cc b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/file.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/file.cc
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/file.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/file.h b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/file.h
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/kernel.cl b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/kernel.cl
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/kernel_offline.cl b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/kernel_offline.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/kernel_offline.cl
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/kernel_offline.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/main.c b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/main.c
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_baseline/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/Makefile b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/Makefile
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/common.h b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/common.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/common.h
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/common.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/file.cc b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/file.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/file.cc
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/file.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/file.h b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/file.h
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel-spir64.bc b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel-spir64.bc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel-spir64.bc
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel-spir64.bc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel-spir64.ll b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel-spir64.ll
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel-spir64.ll
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel-spir64.ll
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel.cl b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel.cl
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel.ir b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel.ir
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel.ir
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel.ir
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel_offline.cl b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel_offline.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel_offline.cl
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/kernel_offline.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/main.c b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/main.c
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_default/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/Makefile b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/Makefile
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/common.h b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/common.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/common.h
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/common.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/file.cc b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/file.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/file.cc
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/file.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/file.h b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/file.h
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel-spir64.bc b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel-spir64.bc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel-spir64.bc
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel-spir64.bc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel-spir64.ll b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel-spir64.ll
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel-spir64.ll
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel-spir64.ll
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel.cl b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel.cl
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel.ir b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel.ir
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel.ir
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel.ir
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel_offline.cl b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel_offline.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel_offline.cl
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/kernel_offline.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/main.c b/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/main.c
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_cpu_large/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_fermi/Makefile b/hpvm/test/parboil/benchmarks/stencil/src/opencl_fermi/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_fermi/Makefile
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_fermi/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_fermi/common.h b/hpvm/test/parboil/benchmarks/stencil/src/opencl_fermi/common.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_fermi/common.h
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_fermi/common.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_fermi/file.cc b/hpvm/test/parboil/benchmarks/stencil/src/opencl_fermi/file.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_fermi/file.cc
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_fermi/file.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_fermi/file.h b/hpvm/test/parboil/benchmarks/stencil/src/opencl_fermi/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_fermi/file.h
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_fermi/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_fermi/kernel.cl b/hpvm/test/parboil/benchmarks/stencil/src/opencl_fermi/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_fermi/kernel.cl
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_fermi/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_fermi/main.c b/hpvm/test/parboil/benchmarks/stencil/src/opencl_fermi/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_fermi/main.c
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_fermi/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_nvidia/Makefile b/hpvm/test/parboil/benchmarks/stencil/src/opencl_nvidia/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_nvidia/Makefile
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_nvidia/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_nvidia/common.h b/hpvm/test/parboil/benchmarks/stencil/src/opencl_nvidia/common.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_nvidia/common.h
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_nvidia/common.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_nvidia/file.cc b/hpvm/test/parboil/benchmarks/stencil/src/opencl_nvidia/file.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_nvidia/file.cc
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_nvidia/file.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_nvidia/file.h b/hpvm/test/parboil/benchmarks/stencil/src/opencl_nvidia/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_nvidia/file.h
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_nvidia/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_nvidia/kernel.cl b/hpvm/test/parboil/benchmarks/stencil/src/opencl_nvidia/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_nvidia/kernel.cl
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_nvidia/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_nvidia/main.c b/hpvm/test/parboil/benchmarks/stencil/src/opencl_nvidia/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/opencl_nvidia/main.c
rename to hpvm/test/parboil/benchmarks/stencil/src/opencl_nvidia/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/visc/Makefile b/hpvm/test/parboil/benchmarks/stencil/src/visc/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/visc/Makefile
rename to hpvm/test/parboil/benchmarks/stencil/src/visc/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/visc/common.h b/hpvm/test/parboil/benchmarks/stencil/src/visc/common.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/visc/common.h
rename to hpvm/test/parboil/benchmarks/stencil/src/visc/common.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/visc/file.cc b/hpvm/test/parboil/benchmarks/stencil/src/visc/file.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/visc/file.cc
rename to hpvm/test/parboil/benchmarks/stencil/src/visc/file.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/visc/file.h b/hpvm/test/parboil/benchmarks/stencil/src/visc/file.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/visc/file.h
rename to hpvm/test/parboil/benchmarks/stencil/src/visc/file.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/visc/kernel.cl b/hpvm/test/parboil/benchmarks/stencil/src/visc/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/visc/kernel.cl
rename to hpvm/test/parboil/benchmarks/stencil/src/visc/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/visc/stencil.cpp b/hpvm/test/parboil/benchmarks/stencil/src/visc/stencil.cpp
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/visc/stencil.cpp
rename to hpvm/test/parboil/benchmarks/stencil/src/visc/stencil.cpp
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/visc_vec/common.h b/hpvm/test/parboil/benchmarks/stencil/src/visc_vec/common.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/visc_vec/common.h
rename to hpvm/test/parboil/benchmarks/stencil/src/visc_vec/common.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/visc_vec/stencil.c b/hpvm/test/parboil/benchmarks/stencil/src/visc_vec/stencil.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/visc_vec/stencil.c
rename to hpvm/test/parboil/benchmarks/stencil/src/visc_vec/stencil.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/visc_vec/stencil.visc.ll b/hpvm/test/parboil/benchmarks/stencil/src/visc_vec/stencil.visc.ll
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/src/visc_vec/stencil.visc.ll
rename to hpvm/test/parboil/benchmarks/stencil/src/visc_vec/stencil.visc.ll
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/stencil/tools/compare-output b/hpvm/test/parboil/benchmarks/stencil/tools/compare-output
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/stencil/tools/compare-output
rename to hpvm/test/parboil/benchmarks/stencil/tools/compare-output
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/DESCRIPTION b/hpvm/test/parboil/benchmarks/tpacf/DESCRIPTION
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/DESCRIPTION
rename to hpvm/test/parboil/benchmarks/tpacf/DESCRIPTION
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/Makefile b/hpvm/test/parboil/benchmarks/tpacf/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/Makefile
rename to hpvm/test/parboil/benchmarks/tpacf/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/base/Makefile b/hpvm/test/parboil/benchmarks/tpacf/src/base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/base/Makefile
rename to hpvm/test/parboil/benchmarks/tpacf/src/base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/base/args.c b/hpvm/test/parboil/benchmarks/tpacf/src/base/args.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/base/args.c
rename to hpvm/test/parboil/benchmarks/tpacf/src/base/args.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/base/args.h b/hpvm/test/parboil/benchmarks/tpacf/src/base/args.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/base/args.h
rename to hpvm/test/parboil/benchmarks/tpacf/src/base/args.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/base/main.c b/hpvm/test/parboil/benchmarks/tpacf/src/base/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/base/main.c
rename to hpvm/test/parboil/benchmarks/tpacf/src/base/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/base/model.h b/hpvm/test/parboil/benchmarks/tpacf/src/base/model.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/base/model.h
rename to hpvm/test/parboil/benchmarks/tpacf/src/base/model.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/base/model_compute_cpu.c b/hpvm/test/parboil/benchmarks/tpacf/src/base/model_compute_cpu.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/base/model_compute_cpu.c
rename to hpvm/test/parboil/benchmarks/tpacf/src/base/model_compute_cpu.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/base/model_io.c b/hpvm/test/parboil/benchmarks/tpacf/src/base/model_io.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/base/model_io.c
rename to hpvm/test/parboil/benchmarks/tpacf/src/base/model_io.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/cuda/Makefile b/hpvm/test/parboil/benchmarks/tpacf/src/cuda/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/cuda/Makefile
rename to hpvm/test/parboil/benchmarks/tpacf/src/cuda/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/cuda/args.cc b/hpvm/test/parboil/benchmarks/tpacf/src/cuda/args.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/cuda/args.cc
rename to hpvm/test/parboil/benchmarks/tpacf/src/cuda/args.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/cuda/args.h b/hpvm/test/parboil/benchmarks/tpacf/src/cuda/args.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/cuda/args.h
rename to hpvm/test/parboil/benchmarks/tpacf/src/cuda/args.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/cuda/main.cu b/hpvm/test/parboil/benchmarks/tpacf/src/cuda/main.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/cuda/main.cu
rename to hpvm/test/parboil/benchmarks/tpacf/src/cuda/main.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/cuda/model.h b/hpvm/test/parboil/benchmarks/tpacf/src/cuda/model.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/cuda/model.h
rename to hpvm/test/parboil/benchmarks/tpacf/src/cuda/model.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/cuda/model_io.cc b/hpvm/test/parboil/benchmarks/tpacf/src/cuda/model_io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/cuda/model_io.cc
rename to hpvm/test/parboil/benchmarks/tpacf/src/cuda/model_io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/cuda/tpacf_kernel.cu b/hpvm/test/parboil/benchmarks/tpacf/src/cuda/tpacf_kernel.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/cuda/tpacf_kernel.cu
rename to hpvm/test/parboil/benchmarks/tpacf/src/cuda/tpacf_kernel.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/cuda_base/Makefile b/hpvm/test/parboil/benchmarks/tpacf/src/cuda_base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/cuda_base/Makefile
rename to hpvm/test/parboil/benchmarks/tpacf/src/cuda_base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/cuda_base/args.cc b/hpvm/test/parboil/benchmarks/tpacf/src/cuda_base/args.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/cuda_base/args.cc
rename to hpvm/test/parboil/benchmarks/tpacf/src/cuda_base/args.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/cuda_base/args.h b/hpvm/test/parboil/benchmarks/tpacf/src/cuda_base/args.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/cuda_base/args.h
rename to hpvm/test/parboil/benchmarks/tpacf/src/cuda_base/args.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/cuda_base/main.cu b/hpvm/test/parboil/benchmarks/tpacf/src/cuda_base/main.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/cuda_base/main.cu
rename to hpvm/test/parboil/benchmarks/tpacf/src/cuda_base/main.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/cuda_base/model.h b/hpvm/test/parboil/benchmarks/tpacf/src/cuda_base/model.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/cuda_base/model.h
rename to hpvm/test/parboil/benchmarks/tpacf/src/cuda_base/model.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/cuda_base/model_io.cc b/hpvm/test/parboil/benchmarks/tpacf/src/cuda_base/model_io.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/cuda_base/model_io.cc
rename to hpvm/test/parboil/benchmarks/tpacf/src/cuda_base/model_io.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/cuda_base/tpacf_kernel.cu b/hpvm/test/parboil/benchmarks/tpacf/src/cuda_base/tpacf_kernel.cu
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/cuda_base/tpacf_kernel.cu
rename to hpvm/test/parboil/benchmarks/tpacf/src/cuda_base/tpacf_kernel.cu
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/omp_base/Makefile b/hpvm/test/parboil/benchmarks/tpacf/src/omp_base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/omp_base/Makefile
rename to hpvm/test/parboil/benchmarks/tpacf/src/omp_base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/omp_base/args.c b/hpvm/test/parboil/benchmarks/tpacf/src/omp_base/args.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/omp_base/args.c
rename to hpvm/test/parboil/benchmarks/tpacf/src/omp_base/args.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/omp_base/args.h b/hpvm/test/parboil/benchmarks/tpacf/src/omp_base/args.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/omp_base/args.h
rename to hpvm/test/parboil/benchmarks/tpacf/src/omp_base/args.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/omp_base/main.c b/hpvm/test/parboil/benchmarks/tpacf/src/omp_base/main.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/omp_base/main.c
rename to hpvm/test/parboil/benchmarks/tpacf/src/omp_base/main.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/omp_base/model.h b/hpvm/test/parboil/benchmarks/tpacf/src/omp_base/model.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/omp_base/model.h
rename to hpvm/test/parboil/benchmarks/tpacf/src/omp_base/model.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/omp_base/model_compute_cpu.c b/hpvm/test/parboil/benchmarks/tpacf/src/omp_base/model_compute_cpu.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/omp_base/model_compute_cpu.c
rename to hpvm/test/parboil/benchmarks/tpacf/src/omp_base/model_compute_cpu.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/omp_base/model_io.c b/hpvm/test/parboil/benchmarks/tpacf/src/omp_base/model_io.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/omp_base/model_io.c
rename to hpvm/test/parboil/benchmarks/tpacf/src/omp_base/model_io.c
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base/Makefile b/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base/Makefile
rename to hpvm/test/parboil/benchmarks/tpacf/src/opencl_base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base/args.cc b/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base/args.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base/args.cc
rename to hpvm/test/parboil/benchmarks/tpacf/src/opencl_base/args.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base/args.h b/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base/args.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base/args.h
rename to hpvm/test/parboil/benchmarks/tpacf/src/opencl_base/args.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base/kernel.cl b/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base/kernel.cl
rename to hpvm/test/parboil/benchmarks/tpacf/src/opencl_base/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base/main.cc b/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base/main.cc
rename to hpvm/test/parboil/benchmarks/tpacf/src/opencl_base/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base/model.cc b/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base/model.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base/model.cc
rename to hpvm/test/parboil/benchmarks/tpacf/src/opencl_base/model.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base/model.h b/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base/model.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base/model.h
rename to hpvm/test/parboil/benchmarks/tpacf/src/opencl_base/model.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/Makefile b/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/Makefile
rename to hpvm/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/args.cc b/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/args.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/args.cc
rename to hpvm/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/args.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/args.h b/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/args.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/args.h
rename to hpvm/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/args.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/kernel.cl b/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/kernel.cl
rename to hpvm/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/main.cc b/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/main.cc
rename to hpvm/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/model.cc b/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/model.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/model.cc
rename to hpvm/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/model.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/model.h b/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/model.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/model.h
rename to hpvm/test/parboil/benchmarks/tpacf/src/opencl_base_dynamic1d/model.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/Makefile b/hpvm/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/Makefile
rename to hpvm/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/args.cc b/hpvm/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/args.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/args.cc
rename to hpvm/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/args.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/args.h b/hpvm/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/args.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/args.h
rename to hpvm/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/args.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/kernel.cl b/hpvm/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/kernel.cl
rename to hpvm/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/main.cc b/hpvm/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/main.cc
rename to hpvm/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/model.cc b/hpvm/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/model.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/model.cc
rename to hpvm/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/model.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/model.h b/hpvm/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/model.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/model.h
rename to hpvm/test/parboil/benchmarks/tpacf/src/opencl_cpu_base/model.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_nvidia/Makefile b/hpvm/test/parboil/benchmarks/tpacf/src/opencl_nvidia/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_nvidia/Makefile
rename to hpvm/test/parboil/benchmarks/tpacf/src/opencl_nvidia/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_nvidia/args.cc b/hpvm/test/parboil/benchmarks/tpacf/src/opencl_nvidia/args.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_nvidia/args.cc
rename to hpvm/test/parboil/benchmarks/tpacf/src/opencl_nvidia/args.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_nvidia/args.h b/hpvm/test/parboil/benchmarks/tpacf/src/opencl_nvidia/args.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_nvidia/args.h
rename to hpvm/test/parboil/benchmarks/tpacf/src/opencl_nvidia/args.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_nvidia/kernel.cl b/hpvm/test/parboil/benchmarks/tpacf/src/opencl_nvidia/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_nvidia/kernel.cl
rename to hpvm/test/parboil/benchmarks/tpacf/src/opencl_nvidia/kernel.cl
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_nvidia/main.cc b/hpvm/test/parboil/benchmarks/tpacf/src/opencl_nvidia/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_nvidia/main.cc
rename to hpvm/test/parboil/benchmarks/tpacf/src/opencl_nvidia/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_nvidia/model.cc b/hpvm/test/parboil/benchmarks/tpacf/src/opencl_nvidia/model.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_nvidia/model.cc
rename to hpvm/test/parboil/benchmarks/tpacf/src/opencl_nvidia/model.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_nvidia/model.h b/hpvm/test/parboil/benchmarks/tpacf/src/opencl_nvidia/model.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/opencl_nvidia/model.h
rename to hpvm/test/parboil/benchmarks/tpacf/src/opencl_nvidia/model.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/visc/Makefile b/hpvm/test/parboil/benchmarks/tpacf/src/visc/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/visc/Makefile
rename to hpvm/test/parboil/benchmarks/tpacf/src/visc/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/visc/args.cc b/hpvm/test/parboil/benchmarks/tpacf/src/visc/args.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/visc/args.cc
rename to hpvm/test/parboil/benchmarks/tpacf/src/visc/args.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/visc/args.h b/hpvm/test/parboil/benchmarks/tpacf/src/visc/args.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/visc/args.h
rename to hpvm/test/parboil/benchmarks/tpacf/src/visc/args.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/visc/main.cc b/hpvm/test/parboil/benchmarks/tpacf/src/visc/main.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/visc/main.cc
rename to hpvm/test/parboil/benchmarks/tpacf/src/visc/main.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/visc/model.cc b/hpvm/test/parboil/benchmarks/tpacf/src/visc/model.cc
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/visc/model.cc
rename to hpvm/test/parboil/benchmarks/tpacf/src/visc/model.cc
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/visc/model.h b/hpvm/test/parboil/benchmarks/tpacf/src/visc/model.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/src/visc/model.h
rename to hpvm/test/parboil/benchmarks/tpacf/src/visc/model.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/tpacf/tools/compare-output b/hpvm/test/parboil/benchmarks/tpacf/tools/compare-output
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/benchmarks/tpacf/tools/compare-output
rename to hpvm/test/parboil/benchmarks/tpacf/tools/compare-output
diff --git a/llvm/tools/hpvm/test/parboil/common/Makefile.conf b/hpvm/test/parboil/common/Makefile.conf
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/common/Makefile.conf
rename to hpvm/test/parboil/common/Makefile.conf
diff --git a/llvm/tools/hpvm/test/parboil/common/Makefile.conf.example-ati b/hpvm/test/parboil/common/Makefile.conf.example-ati
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/common/Makefile.conf.example-ati
rename to hpvm/test/parboil/common/Makefile.conf.example-ati
diff --git a/llvm/tools/hpvm/test/parboil/common/Makefile.conf.example-mcuda b/hpvm/test/parboil/common/Makefile.conf.example-mcuda
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/common/Makefile.conf.example-mcuda
rename to hpvm/test/parboil/common/Makefile.conf.example-mcuda
diff --git a/llvm/tools/hpvm/test/parboil/common/Makefile.conf.example-nvidia b/hpvm/test/parboil/common/Makefile.conf.example-nvidia
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/common/Makefile.conf.example-nvidia
rename to hpvm/test/parboil/common/Makefile.conf.example-nvidia
diff --git a/llvm/tools/hpvm/test/parboil/common/include/parboil.h b/hpvm/test/parboil/common/include/parboil.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/common/include/parboil.h
rename to hpvm/test/parboil/common/include/parboil.h
diff --git a/llvm/tools/hpvm/test/parboil/common/include/visc.h b/hpvm/test/parboil/common/include/visc.h
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/common/include/visc.h
rename to hpvm/test/parboil/common/include/visc.h
diff --git a/llvm/tools/hpvm/test/parboil/common/mk/Makefile b/hpvm/test/parboil/common/mk/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/common/mk/Makefile
rename to hpvm/test/parboil/common/mk/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/common/mk/c.mk b/hpvm/test/parboil/common/mk/c.mk
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/common/mk/c.mk
rename to hpvm/test/parboil/common/mk/c.mk
diff --git a/llvm/tools/hpvm/test/parboil/common/mk/cuda.mk b/hpvm/test/parboil/common/mk/cuda.mk
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/common/mk/cuda.mk
rename to hpvm/test/parboil/common/mk/cuda.mk
diff --git a/llvm/tools/hpvm/test/parboil/common/mk/opencl.mk b/hpvm/test/parboil/common/mk/opencl.mk
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/common/mk/opencl.mk
rename to hpvm/test/parboil/common/mk/opencl.mk
diff --git a/llvm/tools/hpvm/test/parboil/common/mk/visc.mk b/hpvm/test/parboil/common/mk/visc.mk
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/common/mk/visc.mk
rename to hpvm/test/parboil/common/mk/visc.mk
diff --git a/llvm/tools/hpvm/test/parboil/common/platform/c.default.mk b/hpvm/test/parboil/common/platform/c.default.mk
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/common/platform/c.default.mk
rename to hpvm/test/parboil/common/platform/c.default.mk
diff --git a/llvm/tools/hpvm/test/parboil/common/platform/c.gcc.mk b/hpvm/test/parboil/common/platform/c.gcc.mk
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/common/platform/c.gcc.mk
rename to hpvm/test/parboil/common/platform/c.gcc.mk
diff --git a/llvm/tools/hpvm/test/parboil/common/platform/cuda.arch20.mk b/hpvm/test/parboil/common/platform/cuda.arch20.mk
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/common/platform/cuda.arch20.mk
rename to hpvm/test/parboil/common/platform/cuda.arch20.mk
diff --git a/llvm/tools/hpvm/test/parboil/common/platform/cuda.default.mk b/hpvm/test/parboil/common/platform/cuda.default.mk
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/common/platform/cuda.default.mk
rename to hpvm/test/parboil/common/platform/cuda.default.mk
diff --git a/llvm/tools/hpvm/test/parboil/common/platform/cuda.mcuda.mk b/hpvm/test/parboil/common/platform/cuda.mcuda.mk
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/common/platform/cuda.mcuda.mk
rename to hpvm/test/parboil/common/platform/cuda.mcuda.mk
diff --git a/llvm/tools/hpvm/test/parboil/common/platform/cuda.nvcc.mk b/hpvm/test/parboil/common/platform/cuda.nvcc.mk
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/common/platform/cuda.nvcc.mk
rename to hpvm/test/parboil/common/platform/cuda.nvcc.mk
diff --git a/llvm/tools/hpvm/test/parboil/common/platform/opencl.default.mk b/hpvm/test/parboil/common/platform/opencl.default.mk
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/common/platform/opencl.default.mk
rename to hpvm/test/parboil/common/platform/opencl.default.mk
diff --git a/llvm/tools/hpvm/test/parboil/common/platform/opencl.gcc.mk b/hpvm/test/parboil/common/platform/opencl.gcc.mk
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/common/platform/opencl.gcc.mk
rename to hpvm/test/parboil/common/platform/opencl.gcc.mk
diff --git a/llvm/tools/hpvm/test/parboil/common/platform/visc.default.mk b/hpvm/test/parboil/common/platform/visc.default.mk
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/common/platform/visc.default.mk
rename to hpvm/test/parboil/common/platform/visc.default.mk
diff --git a/llvm/tools/hpvm/test/parboil/common/python/binaryfilecompare.py b/hpvm/test/parboil/common/python/binaryfilecompare.py
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/common/python/binaryfilecompare.py
rename to hpvm/test/parboil/common/python/binaryfilecompare.py
diff --git a/llvm/tools/hpvm/test/parboil/common/python/filecompare.py b/hpvm/test/parboil/common/python/filecompare.py
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/common/python/filecompare.py
rename to hpvm/test/parboil/common/python/filecompare.py
diff --git a/llvm/tools/hpvm/test/parboil/common/python/textfilecompare.py b/hpvm/test/parboil/common/python/textfilecompare.py
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/common/python/textfilecompare.py
rename to hpvm/test/parboil/common/python/textfilecompare.py
diff --git a/llvm/tools/hpvm/test/parboil/common/src/Makefile b/hpvm/test/parboil/common/src/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/common/src/Makefile
rename to hpvm/test/parboil/common/src/Makefile
diff --git a/llvm/tools/hpvm/test/parboil/common/src/parboil.c b/hpvm/test/parboil/common/src/parboil.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/common/src/parboil.c
rename to hpvm/test/parboil/common/src/parboil.c
diff --git a/llvm/tools/hpvm/test/parboil/common/src/parboil_cuda.c b/hpvm/test/parboil/common/src/parboil_cuda.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/common/src/parboil_cuda.c
rename to hpvm/test/parboil/common/src/parboil_cuda.c
diff --git a/llvm/tools/hpvm/test/parboil/common/src/parboil_opencl.c b/hpvm/test/parboil/common/src/parboil_opencl.c
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/common/src/parboil_opencl.c
rename to hpvm/test/parboil/common/src/parboil_opencl.c
diff --git a/llvm/tools/hpvm/test/parboil/common/src/subtimerREADME.txt b/hpvm/test/parboil/common/src/subtimerREADME.txt
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/common/src/subtimerREADME.txt
rename to hpvm/test/parboil/common/src/subtimerREADME.txt
diff --git a/llvm/tools/hpvm/test/parboil/config b/hpvm/test/parboil/config
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/config
rename to hpvm/test/parboil/config
diff --git a/llvm/tools/hpvm/test/parboil/driver/__init__.py b/hpvm/test/parboil/driver/__init__.py
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/driver/__init__.py
rename to hpvm/test/parboil/driver/__init__.py
diff --git a/llvm/tools/hpvm/test/parboil/driver/actions.py b/hpvm/test/parboil/driver/actions.py
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/driver/actions.py
rename to hpvm/test/parboil/driver/actions.py
diff --git a/llvm/tools/hpvm/test/parboil/driver/benchmark.py b/hpvm/test/parboil/driver/benchmark.py
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/driver/benchmark.py
rename to hpvm/test/parboil/driver/benchmark.py
diff --git a/llvm/tools/hpvm/test/parboil/driver/benchmark.py-darcs-backup0 b/hpvm/test/parboil/driver/benchmark.py-darcs-backup0
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/driver/benchmark.py-darcs-backup0
rename to hpvm/test/parboil/driver/benchmark.py-darcs-backup0
diff --git a/llvm/tools/hpvm/test/parboil/driver/error.py b/hpvm/test/parboil/driver/error.py
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/driver/error.py
rename to hpvm/test/parboil/driver/error.py
diff --git a/llvm/tools/hpvm/test/parboil/driver/futures.py b/hpvm/test/parboil/driver/futures.py
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/driver/futures.py
rename to hpvm/test/parboil/driver/futures.py
diff --git a/llvm/tools/hpvm/test/parboil/driver/globals.py b/hpvm/test/parboil/driver/globals.py
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/driver/globals.py
rename to hpvm/test/parboil/driver/globals.py
diff --git a/llvm/tools/hpvm/test/parboil/driver/options.py b/hpvm/test/parboil/driver/options.py
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/driver/options.py
rename to hpvm/test/parboil/driver/options.py
diff --git a/llvm/tools/hpvm/test/parboil/driver/parboilfile.py b/hpvm/test/parboil/driver/parboilfile.py
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/driver/parboilfile.py
rename to hpvm/test/parboil/driver/parboilfile.py
diff --git a/llvm/tools/hpvm/test/parboil/driver/parboilfile.py-darcs-backup0 b/hpvm/test/parboil/driver/parboilfile.py-darcs-backup0
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/driver/parboilfile.py-darcs-backup0
rename to hpvm/test/parboil/driver/parboilfile.py-darcs-backup0
diff --git a/llvm/tools/hpvm/test/parboil/driver/ppkg.benchmarks b/hpvm/test/parboil/driver/ppkg.benchmarks
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/driver/ppkg.benchmarks
rename to hpvm/test/parboil/driver/ppkg.benchmarks
diff --git a/llvm/tools/hpvm/test/parboil/driver/ppkg.ignore b/hpvm/test/parboil/driver/ppkg.ignore
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/driver/ppkg.ignore
rename to hpvm/test/parboil/driver/ppkg.ignore
diff --git a/llvm/tools/hpvm/test/parboil/driver/ppkg.py b/hpvm/test/parboil/driver/ppkg.py
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/driver/ppkg.py
rename to hpvm/test/parboil/driver/ppkg.py
diff --git a/llvm/tools/hpvm/test/parboil/driver/process.py b/hpvm/test/parboil/driver/process.py
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/driver/process.py
rename to hpvm/test/parboil/driver/process.py
diff --git a/llvm/tools/hpvm/test/parboil/driver/sanity_check.py b/hpvm/test/parboil/driver/sanity_check.py
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/driver/sanity_check.py
rename to hpvm/test/parboil/driver/sanity_check.py
diff --git a/llvm/tools/hpvm/test/parboil/driver/text.py b/hpvm/test/parboil/driver/text.py
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/driver/text.py
rename to hpvm/test/parboil/driver/text.py
diff --git a/llvm/tools/hpvm/test/parboil/parboil b/hpvm/test/parboil/parboil
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/parboil
rename to hpvm/test/parboil/parboil
diff --git a/llvm/tools/hpvm/test/parboil/parboilParser.py b/hpvm/test/parboil/parboilParser.py
similarity index 100%
rename from llvm/tools/hpvm/test/parboil/parboilParser.py
rename to hpvm/test/parboil/parboilParser.py
diff --git a/llvm/tools/hpvm/test/singleVecNode/Makefile b/hpvm/test/singleVecNode/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/singleVecNode/Makefile
rename to hpvm/test/singleVecNode/Makefile
diff --git a/llvm/tools/hpvm/test/singleVecNode/singleVecNode.c b/hpvm/test/singleVecNode/singleVecNode.c
similarity index 100%
rename from llvm/tools/hpvm/test/singleVecNode/singleVecNode.c
rename to hpvm/test/singleVecNode/singleVecNode.c
diff --git a/llvm/tools/hpvm/test/singleVecNode/visc_singleVecNode.ll b/hpvm/test/singleVecNode/visc_singleVecNode.ll
similarity index 100%
rename from llvm/tools/hpvm/test/singleVecNode/visc_singleVecNode.ll
rename to hpvm/test/singleVecNode/visc_singleVecNode.ll
diff --git a/llvm/tools/hpvm/test/testKernel/kernel-spir32.ll b/hpvm/test/testKernel/kernel-spir32.ll
similarity index 100%
rename from llvm/tools/hpvm/test/testKernel/kernel-spir32.ll
rename to hpvm/test/testKernel/kernel-spir32.ll
diff --git a/llvm/tools/hpvm/test/testKernel/kernel-spir64.ll b/hpvm/test/testKernel/kernel-spir64.ll
similarity index 100%
rename from llvm/tools/hpvm/test/testKernel/kernel-spir64.ll
rename to hpvm/test/testKernel/kernel-spir64.ll
diff --git a/llvm/tools/hpvm/test/testKernel/kernel.asm b/hpvm/test/testKernel/kernel.asm
similarity index 100%
rename from llvm/tools/hpvm/test/testKernel/kernel.asm
rename to hpvm/test/testKernel/kernel.asm
diff --git a/llvm/tools/hpvm/test/testKernel/kernel.cl b/hpvm/test/testKernel/kernel.cl
similarity index 100%
rename from llvm/tools/hpvm/test/testKernel/kernel.cl
rename to hpvm/test/testKernel/kernel.cl
diff --git a/llvm/tools/hpvm/test/testKernel/kernel.ll b/hpvm/test/testKernel/kernel.ll
similarity index 100%
rename from llvm/tools/hpvm/test/testKernel/kernel.ll
rename to hpvm/test/testKernel/kernel.ll
diff --git a/llvm/tools/hpvm/test/unitTests/CreateNodeAndEdge.c b/hpvm/test/unitTests/CreateNodeAndEdge.c
similarity index 100%
rename from llvm/tools/hpvm/test/unitTests/CreateNodeAndEdge.c
rename to hpvm/test/unitTests/CreateNodeAndEdge.c
diff --git a/llvm/tools/hpvm/test/unitTests/Makefile b/hpvm/test/unitTests/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/unitTests/Makefile
rename to hpvm/test/unitTests/Makefile
diff --git a/llvm/tools/hpvm/test/unitTests/MallocIntrinsic.c b/hpvm/test/unitTests/MallocIntrinsic.c
similarity index 100%
rename from llvm/tools/hpvm/test/unitTests/MallocIntrinsic.c
rename to hpvm/test/unitTests/MallocIntrinsic.c
diff --git a/llvm/tools/hpvm/test/unitTests/PipelineIntrinsics.c b/hpvm/test/unitTests/PipelineIntrinsics.c
similarity index 100%
rename from llvm/tools/hpvm/test/unitTests/PipelineIntrinsics.c
rename to hpvm/test/unitTests/PipelineIntrinsics.c
diff --git a/llvm/tools/hpvm/test/unitTests/PipelineIntrinsics.malloc.c b/hpvm/test/unitTests/PipelineIntrinsics.malloc.c
similarity index 100%
rename from llvm/tools/hpvm/test/unitTests/PipelineIntrinsics.malloc.c
rename to hpvm/test/unitTests/PipelineIntrinsics.malloc.c
diff --git a/llvm/tools/hpvm/test/unitTests/lit.local.cfg b/hpvm/test/unitTests/lit.local.cfg
similarity index 100%
rename from llvm/tools/hpvm/test/unitTests/lit.local.cfg
rename to hpvm/test/unitTests/lit.local.cfg
diff --git a/llvm/tools/hpvm/test/unitTests/temp/3level.ll b/hpvm/test/unitTests/temp/3level.ll
similarity index 100%
rename from llvm/tools/hpvm/test/unitTests/temp/3level.ll
rename to hpvm/test/unitTests/temp/3level.ll
diff --git a/llvm/tools/hpvm/test/unitTests/temp/Makefile b/hpvm/test/unitTests/temp/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/unitTests/temp/Makefile
rename to hpvm/test/unitTests/temp/Makefile
diff --git a/llvm/tools/hpvm/test/unitTests/temp/lit.local.cfg b/hpvm/test/unitTests/temp/lit.local.cfg
similarity index 100%
rename from llvm/tools/hpvm/test/unitTests/temp/lit.local.cfg
rename to hpvm/test/unitTests/temp/lit.local.cfg
diff --git a/llvm/tools/hpvm/test/unitTests/temp/query2D.ll b/hpvm/test/unitTests/temp/query2D.ll
similarity index 100%
rename from llvm/tools/hpvm/test/unitTests/temp/query2D.ll
rename to hpvm/test/unitTests/temp/query2D.ll
diff --git a/llvm/tools/hpvm/test/unitTests/temp/query3D.ll b/hpvm/test/unitTests/temp/query3D.ll
similarity index 100%
rename from llvm/tools/hpvm/test/unitTests/temp/query3D.ll
rename to hpvm/test/unitTests/temp/query3D.ll
diff --git a/llvm/tools/hpvm/test/unitTests/temp/queryNodeInst.ll b/hpvm/test/unitTests/temp/queryNodeInst.ll
similarity index 100%
rename from llvm/tools/hpvm/test/unitTests/temp/queryNodeInst.ll
rename to hpvm/test/unitTests/temp/queryNodeInst.ll
diff --git a/llvm/tools/hpvm/test/unitTests/temp/queryNumDim.ll b/hpvm/test/unitTests/temp/queryNumDim.ll
similarity index 100%
rename from llvm/tools/hpvm/test/unitTests/temp/queryNumDim.ll
rename to hpvm/test/unitTests/temp/queryNumDim.ll
diff --git a/llvm/tools/hpvm/test/unitTests/temp/queryNumNodeInst.ll b/hpvm/test/unitTests/temp/queryNumNodeInst.ll
similarity index 100%
rename from llvm/tools/hpvm/test/unitTests/temp/queryNumNodeInst.ll
rename to hpvm/test/unitTests/temp/queryNumNodeInst.ll
diff --git a/llvm/tools/hpvm/test/unitTests/temp/singleNode.ll b/hpvm/test/unitTests/temp/singleNode.ll
similarity index 100%
rename from llvm/tools/hpvm/test/unitTests/temp/singleNode.ll
rename to hpvm/test/unitTests/temp/singleNode.ll
diff --git a/llvm/tools/hpvm/test/unitTests/temp/singleNodeStream.ll b/hpvm/test/unitTests/temp/singleNodeStream.ll
similarity index 100%
rename from llvm/tools/hpvm/test/unitTests/temp/singleNodeStream.ll
rename to hpvm/test/unitTests/temp/singleNodeStream.ll
diff --git a/llvm/tools/hpvm/test/unitTests/temp/twoLaunch.ll b/hpvm/test/unitTests/temp/twoLaunch.ll
similarity index 100%
rename from llvm/tools/hpvm/test/unitTests/temp/twoLaunch.ll
rename to hpvm/test/unitTests/temp/twoLaunch.ll
diff --git a/llvm/tools/hpvm/test/unitTests/temp/twoNode.ll b/hpvm/test/unitTests/temp/twoNode.ll
similarity index 100%
rename from llvm/tools/hpvm/test/unitTests/temp/twoNode.ll
rename to hpvm/test/unitTests/temp/twoNode.ll
diff --git a/llvm/tools/hpvm/test/unitTests/temp/twoNodeConnect.ll b/hpvm/test/unitTests/temp/twoNodeConnect.ll
similarity index 100%
rename from llvm/tools/hpvm/test/unitTests/temp/twoNodeConnect.ll
rename to hpvm/test/unitTests/temp/twoNodeConnect.ll
diff --git a/llvm/tools/hpvm/test/unitTests/temp/twoNodeQuery.ll b/hpvm/test/unitTests/temp/twoNodeQuery.ll
similarity index 100%
rename from llvm/tools/hpvm/test/unitTests/temp/twoNodeQuery.ll
rename to hpvm/test/unitTests/temp/twoNodeQuery.ll
diff --git a/llvm/tools/hpvm/test/unitTests/temp/twoNodeStream.ll b/hpvm/test/unitTests/temp/twoNodeStream.ll
similarity index 100%
rename from llvm/tools/hpvm/test/unitTests/temp/twoNodeStream.ll
rename to hpvm/test/unitTests/temp/twoNodeStream.ll
diff --git a/llvm/tools/hpvm/test/unitTests/visc.h b/hpvm/test/unitTests/visc.h
similarity index 100%
rename from llvm/tools/hpvm/test/unitTests/visc.h
rename to hpvm/test/unitTests/visc.h
diff --git a/llvm/tools/hpvm/test/vectorAdd/Makefile b/hpvm/test/vectorAdd/Makefile
similarity index 100%
rename from llvm/tools/hpvm/test/vectorAdd/Makefile
rename to hpvm/test/vectorAdd/Makefile
diff --git a/llvm/tools/hpvm/test/vectorAdd/old_visc_vecadd.ll b/hpvm/test/vectorAdd/old_visc_vecadd.ll
similarity index 100%
rename from llvm/tools/hpvm/test/vectorAdd/old_visc_vecadd.ll
rename to hpvm/test/vectorAdd/old_visc_vecadd.ll
diff --git a/llvm/tools/hpvm/test/vectorAdd/vecadd.c b/hpvm/test/vectorAdd/vecadd.c
similarity index 100%
rename from llvm/tools/hpvm/test/vectorAdd/vecadd.c
rename to hpvm/test/vectorAdd/vecadd.c
diff --git a/llvm/tools/hpvm/test/vectorAdd/vecadd.ll b/hpvm/test/vectorAdd/vecadd.ll
similarity index 100%
rename from llvm/tools/hpvm/test/vectorAdd/vecadd.ll
rename to hpvm/test/vectorAdd/vecadd.ll
diff --git a/llvm/tools/hpvm/test/vectorAdd/visc_vecadd.ll b/hpvm/test/vectorAdd/visc_vecadd.ll
similarity index 100%
rename from llvm/tools/hpvm/test/vectorAdd/visc_vecadd.ll
rename to hpvm/test/vectorAdd/visc_vecadd.ll
diff --git a/llvm/tools/hpvm/visc-rt/CMakeLists.txt b/hpvm/visc-rt/CMakeLists.txt
similarity index 100%
rename from llvm/tools/hpvm/visc-rt/CMakeLists.txt
rename to hpvm/visc-rt/CMakeLists.txt
diff --git a/llvm/tools/hpvm/visc-rt/deviceStatusSwitchIntervals.txt b/hpvm/visc-rt/deviceStatusSwitchIntervals.txt
similarity index 100%
rename from llvm/tools/hpvm/visc-rt/deviceStatusSwitchIntervals.txt
rename to hpvm/visc-rt/deviceStatusSwitchIntervals.txt
diff --git a/llvm/tools/hpvm/visc-rt/device_abstraction.h b/hpvm/visc-rt/device_abstraction.h
similarity index 100%
rename from llvm/tools/hpvm/visc-rt/device_abstraction.h
rename to hpvm/visc-rt/device_abstraction.h
diff --git a/llvm/tools/hpvm/visc-rt/makefile b/hpvm/visc-rt/makefile
similarity index 100%
rename from llvm/tools/hpvm/visc-rt/makefile
rename to hpvm/visc-rt/makefile
diff --git a/llvm/tools/hpvm/visc-rt/policy.h b/hpvm/visc-rt/policy.h
similarity index 100%
rename from llvm/tools/hpvm/visc-rt/policy.h
rename to hpvm/visc-rt/policy.h
diff --git a/llvm/tools/hpvm/visc-rt/visc-rt.cpp b/hpvm/visc-rt/visc-rt.cpp
similarity index 100%
rename from llvm/tools/hpvm/visc-rt/visc-rt.cpp
rename to hpvm/visc-rt/visc-rt.cpp
diff --git a/llvm/tools/hpvm/visc-rt/visc-rt.h b/hpvm/visc-rt/visc-rt.h
similarity index 100%
rename from llvm/tools/hpvm/visc-rt/visc-rt.h
rename to hpvm/visc-rt/visc-rt.h
diff --git a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/Makefile.config b/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/Makefile.config
deleted file mode 100644
index 4572477e97..0000000000
--- a/llvm/tools/hpvm/test/parboil/benchmarks/hpvm-cava/Makefile.config
+++ /dev/null
@@ -1,28 +0,0 @@
-CUDA_PATH=/usr/local/cuda 
-CUDA_LIB_PATH=/usr/local/cuda/lib64
-#OPENCL_PATH=/opt/intelFPGA_pro/18.0/hld/host/linux64
-#OPENCL_LIB_PATH=$(OPENCL_PATH)/lib
-OPENCL_PATH=/opt/intel/opencl-sdk/
-OPENCL_LIB_PATH=$(OPENCL_PATH)/lib64
-
-#LLVM_SRC_ROOT=/home/kotsifa2/HPVM/Gitlab/hpvm/llvm
-# NOTE: You may need to configure this based on your root path.
-VISC_SRC_ROOT=$(LLVM_SRC_ROOT)
-
-VISC_BUILD_DIR =$(VISC_SRC_ROOT)/../build
-CC = $(VISC_BUILD_DIR)/bin/clang
-PLATFORM_CFLAGS = -I$(LLVM_SRC_ROOT)/include -I$(VISC_BUILD_DIR)/include
-
-CXX = $(VISC_BUILD_DIR)/bin/clang++
-PLATFORM_CXXFLAGS = -I$(LLVM_SRC_ROOT)/include -I$(VISC_BUILD_DIR)/include
-
-LINKER = $(VISC_BUILD_DIR)/bin/clang++
-PLATFORM_LDFLAGS = -lm -lpthread -lrt -lOpenCL -L$(OPENCL_LIB_PATH)
-
-LLVM_LIB_PATH = $(VISC_BUILD_DIR)/lib
-LLVM_BIN_PATH = $(VISC_BUILD_DIR)/bin
-
-OPT = $(LLVM_BIN_PATH)/opt
-LLVM_LINK = $(LLVM_BIN_PATH)/llvm-link
-LLVM_AS = $(LLVM_BIN_PATH)/llvm-as
-LIT = $(LLVM_BIN_PATH)/llvm-lit
-- 
GitLab