diff --git a/llvm/test/CodeGen/VE/addition.ll b/llvm/test/CodeGen/VE/Scalar/addition.ll
rename from llvm/test/CodeGen/VE/addition.ll
rename to llvm/test/CodeGen/VE/Scalar/addition.ll
diff --git a/llvm/test/CodeGen/VE/alloca.ll b/llvm/test/CodeGen/VE/Scalar/alloca.ll
rename from llvm/test/CodeGen/VE/alloca.ll
rename to llvm/test/CodeGen/VE/Scalar/alloca.ll
diff --git a/llvm/test/CodeGen/VE/alloca_aligned.ll b/llvm/test/CodeGen/VE/Scalar/alloca_aligned.ll
rename from llvm/test/CodeGen/VE/alloca_aligned.ll
rename to llvm/test/CodeGen/VE/Scalar/alloca_aligned.ll
diff --git a/llvm/test/CodeGen/VE/and.ll b/llvm/test/CodeGen/VE/Scalar/and.ll
rename from llvm/test/CodeGen/VE/and.ll
rename to llvm/test/CodeGen/VE/Scalar/and.ll
diff --git a/llvm/test/CodeGen/VE/atomic_fence.ll b/llvm/test/CodeGen/VE/Scalar/atomic_fence.ll
rename from llvm/test/CodeGen/VE/atomic_fence.ll
rename to llvm/test/CodeGen/VE/Scalar/atomic_fence.ll
diff --git a/llvm/test/CodeGen/VE/atomic_load.ll b/llvm/test/CodeGen/VE/Scalar/atomic_load.ll
rename from llvm/test/CodeGen/VE/atomic_load.ll
rename to llvm/test/CodeGen/VE/Scalar/atomic_load.ll
diff --git a/llvm/test/CodeGen/VE/atomic_store.ll b/llvm/test/CodeGen/VE/Scalar/atomic_store.ll
rename from llvm/test/CodeGen/VE/atomic_store.ll
rename to llvm/test/CodeGen/VE/Scalar/atomic_store.ll
diff --git a/llvm/test/CodeGen/VE/bitcast.ll b/llvm/test/CodeGen/VE/Scalar/bitcast.ll
rename from llvm/test/CodeGen/VE/bitcast.ll
rename to llvm/test/CodeGen/VE/Scalar/bitcast.ll
diff --git a/llvm/test/CodeGen/VE/bitreverse.ll b/llvm/test/CodeGen/VE/Scalar/bitreverse.ll
rename from llvm/test/CodeGen/VE/bitreverse.ll
rename to llvm/test/CodeGen/VE/Scalar/bitreverse.ll
diff --git a/llvm/test/CodeGen/VE/blockaddress.ll b/llvm/test/CodeGen/VE/Scalar/blockaddress.ll
rename from llvm/test/CodeGen/VE/blockaddress.ll
rename to llvm/test/CodeGen/VE/Scalar/blockaddress.ll
diff --git a/llvm/test/CodeGen/VE/br_cc.ll b/llvm/test/CodeGen/VE/Scalar/br_cc.ll
rename from llvm/test/CodeGen/VE/br_cc.ll
rename to llvm/test/CodeGen/VE/Scalar/br_cc.ll
diff --git a/llvm/test/CodeGen/VE/br_jt.ll b/llvm/test/CodeGen/VE/Scalar/br_jt.ll
rename from llvm/test/CodeGen/VE/br_jt.ll
rename to llvm/test/CodeGen/VE/Scalar/br_jt.ll
diff --git a/llvm/test/CodeGen/VE/brcond.ll b/llvm/test/CodeGen/VE/Scalar/brcond.ll
rename from llvm/test/CodeGen/VE/brcond.ll
rename to llvm/test/CodeGen/VE/Scalar/brcond.ll
diff --git a/llvm/test/CodeGen/VE/brind.ll b/llvm/test/CodeGen/VE/Scalar/brind.ll
rename from llvm/test/CodeGen/VE/brind.ll
rename to llvm/test/CodeGen/VE/Scalar/brind.ll
diff --git a/llvm/test/CodeGen/VE/bswap.ll b/llvm/test/CodeGen/VE/Scalar/bswap.ll
rename from llvm/test/CodeGen/VE/bswap.ll
rename to llvm/test/CodeGen/VE/Scalar/bswap.ll
diff --git a/llvm/test/CodeGen/VE/call.ll b/llvm/test/CodeGen/VE/Scalar/call.ll
rename from llvm/test/CodeGen/VE/call.ll
rename to llvm/test/CodeGen/VE/Scalar/call.ll
diff --git a/llvm/test/CodeGen/VE/callee.ll b/llvm/test/CodeGen/VE/Scalar/callee.ll
rename from llvm/test/CodeGen/VE/callee.ll
rename to llvm/test/CodeGen/VE/Scalar/callee.ll
diff --git a/llvm/test/CodeGen/VE/callstruct.ll b/llvm/test/CodeGen/VE/Scalar/callstruct.ll
rename from llvm/test/CodeGen/VE/callstruct.ll
rename to llvm/test/CodeGen/VE/Scalar/callstruct.ll
diff --git a/llvm/test/CodeGen/VE/cast.ll b/llvm/test/CodeGen/VE/Scalar/cast.ll
rename from llvm/test/CodeGen/VE/cast.ll
rename to llvm/test/CodeGen/VE/Scalar/cast.ll
diff --git a/llvm/test/CodeGen/VE/constants.ll b/llvm/test/CodeGen/VE/Scalar/constants.ll
rename from llvm/test/CodeGen/VE/constants.ll
rename to llvm/test/CodeGen/VE/Scalar/constants.ll
diff --git a/llvm/test/CodeGen/VE/ctlz.ll b/llvm/test/CodeGen/VE/Scalar/ctlz.ll
rename from llvm/test/CodeGen/VE/ctlz.ll
rename to llvm/test/CodeGen/VE/Scalar/ctlz.ll
diff --git a/llvm/test/CodeGen/VE/ctpop.ll b/llvm/test/CodeGen/VE/Scalar/ctpop.ll
rename from llvm/test/CodeGen/VE/ctpop.ll
rename to llvm/test/CodeGen/VE/Scalar/ctpop.ll
diff --git a/llvm/test/CodeGen/VE/cttz.ll b/llvm/test/CodeGen/VE/Scalar/cttz.ll
rename from llvm/test/CodeGen/VE/cttz.ll
rename to llvm/test/CodeGen/VE/Scalar/cttz.ll
diff --git a/llvm/test/CodeGen/VE/div.ll b/llvm/test/CodeGen/VE/Scalar/div.ll
rename from llvm/test/CodeGen/VE/div.ll
rename to llvm/test/CodeGen/VE/Scalar/div.ll
diff --git a/llvm/test/CodeGen/VE/fabs.ll b/llvm/test/CodeGen/VE/Scalar/fabs.ll
rename from llvm/test/CodeGen/VE/fabs.ll
rename to llvm/test/CodeGen/VE/Scalar/fabs.ll
diff --git a/llvm/test/CodeGen/VE/fcopysign.ll b/llvm/test/CodeGen/VE/Scalar/fcopysign.ll
rename from llvm/test/CodeGen/VE/fcopysign.ll
rename to llvm/test/CodeGen/VE/Scalar/fcopysign.ll
diff --git a/llvm/test/CodeGen/VE/fcos.ll b/llvm/test/CodeGen/VE/Scalar/fcos.ll
rename from llvm/test/CodeGen/VE/fcos.ll
rename to llvm/test/CodeGen/VE/Scalar/fcos.ll
diff --git a/llvm/test/CodeGen/VE/fp_add.ll b/llvm/test/CodeGen/VE/Scalar/fp_add.ll
rename from llvm/test/CodeGen/VE/fp_add.ll
rename to llvm/test/CodeGen/VE/Scalar/fp_add.ll
diff --git a/llvm/test/CodeGen/VE/fp_div.ll b/llvm/test/CodeGen/VE/Scalar/fp_div.ll
rename from llvm/test/CodeGen/VE/fp_div.ll
rename to llvm/test/CodeGen/VE/Scalar/fp_div.ll
diff --git a/llvm/test/CodeGen/VE/fp_extload_truncstore.ll b/llvm/test/CodeGen/VE/Scalar/fp_extload_truncstore.ll
rename from llvm/test/CodeGen/VE/fp_extload_truncstore.ll
rename to llvm/test/CodeGen/VE/Scalar/fp_extload_truncstore.ll
diff --git a/llvm/test/CodeGen/VE/fp_fneg.ll b/llvm/test/CodeGen/VE/Scalar/fp_fneg.ll
rename from llvm/test/CodeGen/VE/fp_fneg.ll
rename to llvm/test/CodeGen/VE/Scalar/fp_fneg.ll
diff --git a/llvm/test/CodeGen/VE/fp_frem.ll b/llvm/test/CodeGen/VE/Scalar/fp_frem.ll
rename from llvm/test/CodeGen/VE/fp_frem.ll
rename to llvm/test/CodeGen/VE/Scalar/fp_frem.ll
diff --git a/llvm/test/CodeGen/VE/fp_mul.ll b/llvm/test/CodeGen/VE/Scalar/fp_mul.ll
rename from llvm/test/CodeGen/VE/fp_mul.ll
rename to llvm/test/CodeGen/VE/Scalar/fp_mul.ll
diff --git a/llvm/test/CodeGen/VE/fp_sub.ll b/llvm/test/CodeGen/VE/Scalar/fp_sub.ll
rename from llvm/test/CodeGen/VE/fp_sub.ll
rename to llvm/test/CodeGen/VE/Scalar/fp_sub.ll
diff --git a/llvm/test/CodeGen/VE/fp_to_int.ll b/llvm/test/CodeGen/VE/Scalar/fp_to_int.ll
rename from llvm/test/CodeGen/VE/fp_to_int.ll
rename to llvm/test/CodeGen/VE/Scalar/fp_to_int.ll
diff --git a/llvm/test/CodeGen/VE/fsin.ll b/llvm/test/CodeGen/VE/Scalar/fsin.ll
rename from llvm/test/CodeGen/VE/fsin.ll
rename to llvm/test/CodeGen/VE/Scalar/fsin.ll
diff --git a/llvm/test/CodeGen/VE/fsqrt.ll b/llvm/test/CodeGen/VE/Scalar/fsqrt.ll
rename from llvm/test/CodeGen/VE/fsqrt.ll
rename to llvm/test/CodeGen/VE/Scalar/fsqrt.ll
diff --git a/llvm/test/CodeGen/VE/int_to_fp.ll b/llvm/test/CodeGen/VE/Scalar/int_to_fp.ll
rename from llvm/test/CodeGen/VE/int_to_fp.ll
rename to llvm/test/CodeGen/VE/Scalar/int_to_fp.ll
diff --git a/llvm/test/CodeGen/VE/left_shift.ll b/llvm/test/CodeGen/VE/Scalar/left_shift.ll
rename from llvm/test/CodeGen/VE/left_shift.ll
rename to llvm/test/CodeGen/VE/Scalar/left_shift.ll
diff --git a/llvm/test/CodeGen/VE/load-align1.ll b/llvm/test/CodeGen/VE/Scalar/load-align1.ll
rename from llvm/test/CodeGen/VE/load-align1.ll
rename to llvm/test/CodeGen/VE/Scalar/load-align1.ll
diff --git a/llvm/test/CodeGen/VE/load-align2.ll b/llvm/test/CodeGen/VE/Scalar/load-align2.ll
rename from llvm/test/CodeGen/VE/load-align2.ll
rename to llvm/test/CodeGen/VE/Scalar/load-align2.ll
diff --git a/llvm/test/CodeGen/VE/load-align4.ll b/llvm/test/CodeGen/VE/Scalar/load-align4.ll
rename from llvm/test/CodeGen/VE/load-align4.ll
rename to llvm/test/CodeGen/VE/Scalar/load-align4.ll
diff --git a/llvm/test/CodeGen/VE/load-align8.ll b/llvm/test/CodeGen/VE/Scalar/load-align8.ll
rename from llvm/test/CodeGen/VE/load-align8.ll
rename to llvm/test/CodeGen/VE/Scalar/load-align8.ll
diff --git a/llvm/test/CodeGen/VE/load.ll b/llvm/test/CodeGen/VE/Scalar/load.ll
rename from llvm/test/CodeGen/VE/load.ll
rename to llvm/test/CodeGen/VE/Scalar/load.ll
diff --git a/llvm/test/CodeGen/VE/load_gv.ll b/llvm/test/CodeGen/VE/Scalar/load_gv.ll
rename from llvm/test/CodeGen/VE/load_gv.ll
rename to llvm/test/CodeGen/VE/Scalar/load_gv.ll
diff --git a/llvm/test/CodeGen/VE/load_off.ll b/llvm/test/CodeGen/VE/Scalar/load_off.ll
rename from llvm/test/CodeGen/VE/load_off.ll
rename to llvm/test/CodeGen/VE/Scalar/load_off.ll
diff --git a/llvm/test/CodeGen/VE/loadrri.ll b/llvm/test/CodeGen/VE/Scalar/loadrri.ll
rename from llvm/test/CodeGen/VE/loadrri.ll
rename to llvm/test/CodeGen/VE/Scalar/loadrri.ll
diff --git a/llvm/test/CodeGen/VE/max.ll b/llvm/test/CodeGen/VE/Scalar/max.ll
rename from llvm/test/CodeGen/VE/max.ll
rename to llvm/test/CodeGen/VE/Scalar/max.ll
diff --git a/llvm/test/CodeGen/VE/min.ll b/llvm/test/CodeGen/VE/Scalar/min.ll
rename from llvm/test/CodeGen/VE/min.ll
rename to llvm/test/CodeGen/VE/Scalar/min.ll
diff --git a/llvm/test/CodeGen/VE/multiply.ll b/llvm/test/CodeGen/VE/Scalar/multiply.ll
rename from llvm/test/CodeGen/VE/multiply.ll
rename to llvm/test/CodeGen/VE/Scalar/multiply.ll
diff --git a/llvm/test/CodeGen/VE/nnd.ll b/llvm/test/CodeGen/VE/Scalar/nnd.ll
rename from llvm/test/CodeGen/VE/nnd.ll
rename to llvm/test/CodeGen/VE/Scalar/nnd.ll
diff --git a/llvm/test/CodeGen/VE/or.ll b/llvm/test/CodeGen/VE/Scalar/or.ll
rename from llvm/test/CodeGen/VE/or.ll
rename to llvm/test/CodeGen/VE/Scalar/or.ll
diff --git a/llvm/test/CodeGen/VE/pic_access_data.ll b/llvm/test/CodeGen/VE/Scalar/pic_access_data.ll
rename from llvm/test/CodeGen/VE/pic_access_data.ll
rename to llvm/test/CodeGen/VE/Scalar/pic_access_data.ll
diff --git a/llvm/test/CodeGen/VE/pic_access_static_data.ll b/llvm/test/CodeGen/VE/Scalar/pic_access_static_data.ll
rename from llvm/test/CodeGen/VE/pic_access_static_data.ll
rename to llvm/test/CodeGen/VE/Scalar/pic_access_static_data.ll
diff --git a/llvm/test/CodeGen/VE/pic_func_call.ll b/llvm/test/CodeGen/VE/Scalar/pic_func_call.ll
rename from llvm/test/CodeGen/VE/pic_func_call.ll
rename to llvm/test/CodeGen/VE/Scalar/pic_func_call.ll
diff --git a/llvm/test/CodeGen/VE/pic_indirect_func_call.ll b/llvm/test/CodeGen/VE/Scalar/pic_indirect_func_call.ll
rename from llvm/test/CodeGen/VE/pic_indirect_func_call.ll
rename to llvm/test/CodeGen/VE/Scalar/pic_indirect_func_call.ll
diff --git a/llvm/test/CodeGen/VE/rem.ll b/llvm/test/CodeGen/VE/Scalar/rem.ll
rename from llvm/test/CodeGen/VE/rem.ll
rename to llvm/test/CodeGen/VE/Scalar/rem.ll
diff --git a/llvm/test/CodeGen/VE/right_shift.ll b/llvm/test/CodeGen/VE/Scalar/right_shift.ll
rename from llvm/test/CodeGen/VE/right_shift.ll
rename to llvm/test/CodeGen/VE/Scalar/right_shift.ll
diff --git a/llvm/test/CodeGen/VE/rotl.ll b/llvm/test/CodeGen/VE/Scalar/rotl.ll
rename from llvm/test/CodeGen/VE/rotl.ll
rename to llvm/test/CodeGen/VE/Scalar/rotl.ll
diff --git a/llvm/test/CodeGen/VE/rotr.ll b/llvm/test/CodeGen/VE/Scalar/rotr.ll
rename from llvm/test/CodeGen/VE/rotr.ll
rename to llvm/test/CodeGen/VE/Scalar/rotr.ll
diff --git a/llvm/test/CodeGen/VE/select.ll b/llvm/test/CodeGen/VE/Scalar/select.ll
rename from llvm/test/CodeGen/VE/select.ll
rename to llvm/test/CodeGen/VE/Scalar/select.ll
diff --git a/llvm/test/CodeGen/VE/select_cc.ll b/llvm/test/CodeGen/VE/Scalar/select_cc.ll
rename from llvm/test/CodeGen/VE/select_cc.ll
rename to llvm/test/CodeGen/VE/Scalar/select_cc.ll
diff --git a/llvm/test/CodeGen/VE/selectccf32.ll b/llvm/test/CodeGen/VE/Scalar/selectccf32.ll
rename from llvm/test/CodeGen/VE/selectccf32.ll
rename to llvm/test/CodeGen/VE/Scalar/selectccf32.ll
diff --git a/llvm/test/CodeGen/VE/selectccf32c.ll b/llvm/test/CodeGen/VE/Scalar/selectccf32c.ll
rename from llvm/test/CodeGen/VE/selectccf32c.ll
rename to llvm/test/CodeGen/VE/Scalar/selectccf32c.ll
diff --git a/llvm/test/CodeGen/VE/selectccf32i.ll b/llvm/test/CodeGen/VE/Scalar/selectccf32i.ll
rename from llvm/test/CodeGen/VE/selectccf32i.ll
rename to llvm/test/CodeGen/VE/Scalar/selectccf32i.ll
diff --git a/llvm/test/CodeGen/VE/selectccf64.ll b/llvm/test/CodeGen/VE/Scalar/selectccf64.ll
rename from llvm/test/CodeGen/VE/selectccf64.ll
rename to llvm/test/CodeGen/VE/Scalar/selectccf64.ll
diff --git a/llvm/test/CodeGen/VE/selectccf64c.ll b/llvm/test/CodeGen/VE/Scalar/selectccf64c.ll
rename from llvm/test/CodeGen/VE/selectccf64c.ll
rename to llvm/test/CodeGen/VE/Scalar/selectccf64c.ll
diff --git a/llvm/test/CodeGen/VE/selectccf64i.ll b/llvm/test/CodeGen/VE/Scalar/selectccf64i.ll
rename from llvm/test/CodeGen/VE/selectccf64i.ll
rename to llvm/test/CodeGen/VE/Scalar/selectccf64i.ll
diff --git a/llvm/test/CodeGen/VE/selectcci32.ll b/llvm/test/CodeGen/VE/Scalar/selectcci32.ll
rename from llvm/test/CodeGen/VE/selectcci32.ll
rename to llvm/test/CodeGen/VE/Scalar/selectcci32.ll
diff --git a/llvm/test/CodeGen/VE/selectcci32c.ll b/llvm/test/CodeGen/VE/Scalar/selectcci32c.ll
rename from llvm/test/CodeGen/VE/selectcci32c.ll
rename to llvm/test/CodeGen/VE/Scalar/selectcci32c.ll
diff --git a/llvm/test/CodeGen/VE/selectcci32i.ll b/llvm/test/CodeGen/VE/Scalar/selectcci32i.ll
rename from llvm/test/CodeGen/VE/selectcci32i.ll
rename to llvm/test/CodeGen/VE/Scalar/selectcci32i.ll
diff --git a/llvm/test/CodeGen/VE/selectcci64.ll b/llvm/test/CodeGen/VE/Scalar/selectcci64.ll
rename from llvm/test/CodeGen/VE/selectcci64.ll
rename to llvm/test/CodeGen/VE/Scalar/selectcci64.ll
diff --git a/llvm/test/CodeGen/VE/selectcci64c.ll b/llvm/test/CodeGen/VE/Scalar/selectcci64c.ll
rename from llvm/test/CodeGen/VE/selectcci64c.ll
rename to llvm/test/CodeGen/VE/Scalar/selectcci64c.ll
diff --git a/llvm/test/CodeGen/VE/selectcci64i.ll b/llvm/test/CodeGen/VE/Scalar/selectcci64i.ll
rename from llvm/test/CodeGen/VE/selectcci64i.ll
rename to llvm/test/CodeGen/VE/Scalar/selectcci64i.ll
diff --git a/llvm/test/CodeGen/VE/setcc.ll b/llvm/test/CodeGen/VE/Scalar/setcc.ll
rename from llvm/test/CodeGen/VE/setcc.ll
rename to llvm/test/CodeGen/VE/Scalar/setcc.ll
diff --git a/llvm/test/CodeGen/VE/setccf32.ll b/llvm/test/CodeGen/VE/Scalar/setccf32.ll
rename from llvm/test/CodeGen/VE/setccf32.ll
rename to llvm/test/CodeGen/VE/Scalar/setccf32.ll
diff --git a/llvm/test/CodeGen/VE/setccf32i.ll b/llvm/test/CodeGen/VE/Scalar/setccf32i.ll
rename from llvm/test/CodeGen/VE/setccf32i.ll
rename to llvm/test/CodeGen/VE/Scalar/setccf32i.ll
diff --git a/llvm/test/CodeGen/VE/setccf64.ll b/llvm/test/CodeGen/VE/Scalar/setccf64.ll
rename from llvm/test/CodeGen/VE/setccf64.ll
rename to llvm/test/CodeGen/VE/Scalar/setccf64.ll
diff --git a/llvm/test/CodeGen/VE/setccf64i.ll b/llvm/test/CodeGen/VE/Scalar/setccf64i.ll
rename from llvm/test/CodeGen/VE/setccf64i.ll
rename to llvm/test/CodeGen/VE/Scalar/setccf64i.ll
diff --git a/llvm/test/CodeGen/VE/setcci32.ll b/llvm/test/CodeGen/VE/Scalar/setcci32.ll
rename from llvm/test/CodeGen/VE/setcci32.ll
rename to llvm/test/CodeGen/VE/Scalar/setcci32.ll
diff --git a/llvm/test/CodeGen/VE/setcci32i.ll b/llvm/test/CodeGen/VE/Scalar/setcci32i.ll
rename from llvm/test/CodeGen/VE/setcci32i.ll
rename to llvm/test/CodeGen/VE/Scalar/setcci32i.ll
diff --git a/llvm/test/CodeGen/VE/setcci64.ll b/llvm/test/CodeGen/VE/Scalar/setcci64.ll
rename from llvm/test/CodeGen/VE/setcci64.ll
rename to llvm/test/CodeGen/VE/Scalar/setcci64.ll
diff --git a/llvm/test/CodeGen/VE/setcci64i.ll b/llvm/test/CodeGen/VE/Scalar/setcci64i.ll
rename from llvm/test/CodeGen/VE/setcci64i.ll
rename to llvm/test/CodeGen/VE/Scalar/setcci64i.ll
diff --git a/llvm/test/CodeGen/VE/sext_zext_load.ll b/llvm/test/CodeGen/VE/Scalar/sext_zext_load.ll
rename from llvm/test/CodeGen/VE/sext_zext_load.ll
rename to llvm/test/CodeGen/VE/Scalar/sext_zext_load.ll
diff --git a/llvm/test/CodeGen/VE/shl.ll b/llvm/test/CodeGen/VE/Scalar/shl.ll
rename from llvm/test/CodeGen/VE/shl.ll
rename to llvm/test/CodeGen/VE/Scalar/shl.ll
diff --git a/llvm/test/CodeGen/VE/shr.ll b/llvm/test/CodeGen/VE/Scalar/shr.ll
rename from llvm/test/CodeGen/VE/shr.ll
rename to llvm/test/CodeGen/VE/Scalar/shr.ll
diff --git a/llvm/test/CodeGen/VE/simple_prologue_epilogue.ll b/llvm/test/CodeGen/VE/Scalar/simple_prologue_epilogue.ll
rename from llvm/test/CodeGen/VE/simple_prologue_epilogue.ll
rename to llvm/test/CodeGen/VE/Scalar/simple_prologue_epilogue.ll
diff --git a/llvm/test/CodeGen/VE/sjlj_except.ll b/llvm/test/CodeGen/VE/Scalar/sjlj_except.ll
rename from llvm/test/CodeGen/VE/sjlj_except.ll
rename to llvm/test/CodeGen/VE/Scalar/sjlj_except.ll
diff --git a/llvm/test/CodeGen/VE/store-align1.ll b/llvm/test/CodeGen/VE/Scalar/store-align1.ll
rename from llvm/test/CodeGen/VE/store-align1.ll
rename to llvm/test/CodeGen/VE/Scalar/store-align1.ll
diff --git a/llvm/test/CodeGen/VE/store-align2.ll b/llvm/test/CodeGen/VE/Scalar/store-align2.ll
rename from llvm/test/CodeGen/VE/store-align2.ll
rename to llvm/test/CodeGen/VE/Scalar/store-align2.ll
diff --git a/llvm/test/CodeGen/VE/store-align4.ll b/llvm/test/CodeGen/VE/Scalar/store-align4.ll
rename from llvm/test/CodeGen/VE/store-align4.ll
rename to llvm/test/CodeGen/VE/Scalar/store-align4.ll
diff --git a/llvm/test/CodeGen/VE/store-align8.ll b/llvm/test/CodeGen/VE/Scalar/store-align8.ll
rename from llvm/test/CodeGen/VE/store-align8.ll
rename to llvm/test/CodeGen/VE/Scalar/store-align8.ll
diff --git a/llvm/test/CodeGen/VE/store.ll b/llvm/test/CodeGen/VE/Scalar/store.ll
rename from llvm/test/CodeGen/VE/store.ll
rename to llvm/test/CodeGen/VE/Scalar/store.ll
diff --git a/llvm/test/CodeGen/VE/store_gv.ll b/llvm/test/CodeGen/VE/Scalar/store_gv.ll
rename from llvm/test/CodeGen/VE/store_gv.ll
rename to llvm/test/CodeGen/VE/Scalar/store_gv.ll
diff --git a/llvm/test/CodeGen/VE/subtraction.ll b/llvm/test/CodeGen/VE/Scalar/subtraction.ll
rename from llvm/test/CodeGen/VE/subtraction.ll
rename to llvm/test/CodeGen/VE/Scalar/subtraction.ll
diff --git a/llvm/test/CodeGen/VE/symbol_relocation.ll b/llvm/test/CodeGen/VE/Scalar/symbol_relocation.ll
rename from llvm/test/CodeGen/VE/symbol_relocation.ll
rename to llvm/test/CodeGen/VE/Scalar/symbol_relocation.ll
diff --git a/llvm/test/CodeGen/VE/symbol_relocation_tls.ll b/llvm/test/CodeGen/VE/Scalar/symbol_relocation_tls.ll
rename from llvm/test/CodeGen/VE/symbol_relocation_tls.ll
rename to llvm/test/CodeGen/VE/Scalar/symbol_relocation_tls.ll
diff --git a/llvm/test/CodeGen/VE/target_support.ll b/llvm/test/CodeGen/VE/Scalar/target_support.ll
rename from llvm/test/CodeGen/VE/target_support.ll
rename to llvm/test/CodeGen/VE/Scalar/target_support.ll
diff --git a/llvm/test/CodeGen/VE/tls.ll b/llvm/test/CodeGen/VE/Scalar/tls.ll
rename from llvm/test/CodeGen/VE/tls.ll
rename to llvm/test/CodeGen/VE/Scalar/tls.ll
diff --git a/llvm/test/CodeGen/VE/truncstore.ll b/llvm/test/CodeGen/VE/Scalar/truncstore.ll
rename from llvm/test/CodeGen/VE/truncstore.ll
rename to llvm/test/CodeGen/VE/Scalar/truncstore.ll
diff --git a/llvm/test/CodeGen/VE/va_arg.ll b/llvm/test/CodeGen/VE/Scalar/va_arg.ll
rename from llvm/test/CodeGen/VE/va_arg.ll
rename to llvm/test/CodeGen/VE/Scalar/va_arg.ll
diff --git a/llvm/test/CodeGen/VE/va_callee.ll b/llvm/test/CodeGen/VE/Scalar/va_callee.ll
rename from llvm/test/CodeGen/VE/va_callee.ll
rename to llvm/test/CodeGen/VE/Scalar/va_callee.ll
diff --git a/llvm/test/CodeGen/VE/va_caller.ll b/llvm/test/CodeGen/VE/Scalar/va_caller.ll
rename from llvm/test/CodeGen/VE/va_caller.ll
rename to llvm/test/CodeGen/VE/Scalar/va_caller.ll
diff --git a/llvm/test/CodeGen/VE/xor.ll b/llvm/test/CodeGen/VE/Scalar/xor.ll
rename from llvm/test/CodeGen/VE/xor.ll
rename to llvm/test/CodeGen/VE/Scalar/xor.ll