diff --git a/clang/test/CodeGen/3dnow-builtins.c b/clang/test/CodeGen/X86/3dnow-builtins.c
similarity index 100%
rename from clang/test/CodeGen/3dnow-builtins.c
rename to clang/test/CodeGen/X86/3dnow-builtins.c
diff --git a/clang/test/CodeGen/adc-builtins.c b/clang/test/CodeGen/X86/adc-builtins.c
similarity index 100%
rename from clang/test/CodeGen/adc-builtins.c
rename to clang/test/CodeGen/X86/adc-builtins.c
diff --git a/clang/test/CodeGen/adx-builtins.c b/clang/test/CodeGen/X86/adx-builtins.c
similarity index 100%
rename from clang/test/CodeGen/adx-builtins.c
rename to clang/test/CodeGen/X86/adx-builtins.c
diff --git a/clang/test/CodeGen/avx-builtins-constrained-cmp.c b/clang/test/CodeGen/X86/avx-builtins-constrained-cmp.c
similarity index 100%
rename from clang/test/CodeGen/avx-builtins-constrained-cmp.c
rename to clang/test/CodeGen/X86/avx-builtins-constrained-cmp.c
diff --git a/clang/test/CodeGen/avx-builtins.c b/clang/test/CodeGen/X86/avx-builtins.c
similarity index 100%
rename from clang/test/CodeGen/avx-builtins.c
rename to clang/test/CodeGen/X86/avx-builtins.c
diff --git a/clang/test/CodeGen/avx-cmp-builtins.c b/clang/test/CodeGen/X86/avx-cmp-builtins.c
similarity index 100%
rename from clang/test/CodeGen/avx-cmp-builtins.c
rename to clang/test/CodeGen/X86/avx-cmp-builtins.c
diff --git a/clang/test/CodeGen/avx-shuffle-builtins.c b/clang/test/CodeGen/X86/avx-shuffle-builtins.c
similarity index 100%
rename from clang/test/CodeGen/avx-shuffle-builtins.c
rename to clang/test/CodeGen/X86/avx-shuffle-builtins.c
diff --git a/clang/test/CodeGen/avx2-builtins.c b/clang/test/CodeGen/X86/avx2-builtins.c
similarity index 100%
rename from clang/test/CodeGen/avx2-builtins.c
rename to clang/test/CodeGen/X86/avx2-builtins.c
diff --git a/clang/test/CodeGen/avx512-inline-asm-kregisters-basics.c b/clang/test/CodeGen/X86/avx512-inline-asm-kregisters-basics.c
similarity index 100%
rename from clang/test/CodeGen/avx512-inline-asm-kregisters-basics.c
rename to clang/test/CodeGen/X86/avx512-inline-asm-kregisters-basics.c
diff --git a/clang/test/CodeGen/avx512-kconstraints-att_inline_asm.c b/clang/test/CodeGen/X86/avx512-kconstraints-att_inline_asm.c
similarity index 100%
rename from clang/test/CodeGen/avx512-kconstraints-att_inline_asm.c
rename to clang/test/CodeGen/X86/avx512-kconstraints-att_inline_asm.c
diff --git a/clang/test/CodeGen/avx512-reduceIntrin.c b/clang/test/CodeGen/X86/avx512-reduceIntrin.c
similarity index 100%
rename from clang/test/CodeGen/avx512-reduceIntrin.c
rename to clang/test/CodeGen/X86/avx512-reduceIntrin.c
diff --git a/clang/test/CodeGen/avx512-reduceMinMaxIntrin.c b/clang/test/CodeGen/X86/avx512-reduceMinMaxIntrin.c
similarity index 100%
rename from clang/test/CodeGen/avx512-reduceMinMaxIntrin.c
rename to clang/test/CodeGen/X86/avx512-reduceMinMaxIntrin.c
diff --git a/clang/test/CodeGen/avx512bf16-builtins.c b/clang/test/CodeGen/X86/avx512bf16-builtins.c
similarity index 100%
rename from clang/test/CodeGen/avx512bf16-builtins.c
rename to clang/test/CodeGen/X86/avx512bf16-builtins.c
diff --git a/clang/test/CodeGen/avx512bitalg-builtins.c b/clang/test/CodeGen/X86/avx512bitalg-builtins.c
similarity index 100%
rename from clang/test/CodeGen/avx512bitalg-builtins.c
rename to clang/test/CodeGen/X86/avx512bitalg-builtins.c
diff --git a/clang/test/CodeGen/avx512bw-builtins.c b/clang/test/CodeGen/X86/avx512bw-builtins.c
similarity index 100%
rename from clang/test/CodeGen/avx512bw-builtins.c
rename to clang/test/CodeGen/X86/avx512bw-builtins.c
diff --git a/clang/test/CodeGen/avx512cdintrin.c b/clang/test/CodeGen/X86/avx512cdintrin.c
similarity index 100%
rename from clang/test/CodeGen/avx512cdintrin.c
rename to clang/test/CodeGen/X86/avx512cdintrin.c
diff --git a/clang/test/CodeGen/avx512dq-builtins.c b/clang/test/CodeGen/X86/avx512dq-builtins.c
similarity index 100%
rename from clang/test/CodeGen/avx512dq-builtins.c
rename to clang/test/CodeGen/X86/avx512dq-builtins.c
diff --git a/clang/test/CodeGen/avx512er-builtins.c b/clang/test/CodeGen/X86/avx512er-builtins.c
similarity index 100%
rename from clang/test/CodeGen/avx512er-builtins.c
rename to clang/test/CodeGen/X86/avx512er-builtins.c
diff --git a/clang/test/CodeGen/avx512f-builtins-constrained-cmp.c b/clang/test/CodeGen/X86/avx512f-builtins-constrained-cmp.c
similarity index 100%
rename from clang/test/CodeGen/avx512f-builtins-constrained-cmp.c
rename to clang/test/CodeGen/X86/avx512f-builtins-constrained-cmp.c
diff --git a/clang/test/CodeGen/avx512f-builtins-constrained.c b/clang/test/CodeGen/X86/avx512f-builtins-constrained.c
similarity index 100%
rename from clang/test/CodeGen/avx512f-builtins-constrained.c
rename to clang/test/CodeGen/X86/avx512f-builtins-constrained.c
diff --git a/clang/test/CodeGen/avx512f-builtins.c b/clang/test/CodeGen/X86/avx512f-builtins.c
similarity index 100%
rename from clang/test/CodeGen/avx512f-builtins.c
rename to clang/test/CodeGen/X86/avx512f-builtins.c
diff --git a/clang/test/CodeGen/avx512ifma-builtins.c b/clang/test/CodeGen/X86/avx512ifma-builtins.c
similarity index 100%
rename from clang/test/CodeGen/avx512ifma-builtins.c
rename to clang/test/CodeGen/X86/avx512ifma-builtins.c
diff --git a/clang/test/CodeGen/avx512ifmavl-builtins.c b/clang/test/CodeGen/X86/avx512ifmavl-builtins.c
similarity index 100%
rename from clang/test/CodeGen/avx512ifmavl-builtins.c
rename to clang/test/CodeGen/X86/avx512ifmavl-builtins.c
diff --git a/clang/test/CodeGen/avx512pf-builtins.c b/clang/test/CodeGen/X86/avx512pf-builtins.c
similarity index 100%
rename from clang/test/CodeGen/avx512pf-builtins.c
rename to clang/test/CodeGen/X86/avx512pf-builtins.c
diff --git a/clang/test/CodeGen/avx512vbmi-builtins.c b/clang/test/CodeGen/X86/avx512vbmi-builtins.c
similarity index 100%
rename from clang/test/CodeGen/avx512vbmi-builtins.c
rename to clang/test/CodeGen/X86/avx512vbmi-builtins.c
diff --git a/clang/test/CodeGen/avx512vbmi2-builtins.c b/clang/test/CodeGen/X86/avx512vbmi2-builtins.c
similarity index 100%
rename from clang/test/CodeGen/avx512vbmi2-builtins.c
rename to clang/test/CodeGen/X86/avx512vbmi2-builtins.c
diff --git a/clang/test/CodeGen/avx512vbmivl-builtin.c b/clang/test/CodeGen/X86/avx512vbmivl-builtin.c
similarity index 100%
rename from clang/test/CodeGen/avx512vbmivl-builtin.c
rename to clang/test/CodeGen/X86/avx512vbmivl-builtin.c
diff --git a/clang/test/CodeGen/avx512vl-builtins-constrained-cmp.c b/clang/test/CodeGen/X86/avx512vl-builtins-constrained-cmp.c
similarity index 100%
rename from clang/test/CodeGen/avx512vl-builtins-constrained-cmp.c
rename to clang/test/CodeGen/X86/avx512vl-builtins-constrained-cmp.c
diff --git a/clang/test/CodeGen/avx512vl-builtins-constrained.c b/clang/test/CodeGen/X86/avx512vl-builtins-constrained.c
similarity index 100%
rename from clang/test/CodeGen/avx512vl-builtins-constrained.c
rename to clang/test/CodeGen/X86/avx512vl-builtins-constrained.c
diff --git a/clang/test/CodeGen/avx512vl-builtins.c b/clang/test/CodeGen/X86/avx512vl-builtins.c
similarity index 100%
rename from clang/test/CodeGen/avx512vl-builtins.c
rename to clang/test/CodeGen/X86/avx512vl-builtins.c
diff --git a/clang/test/CodeGen/avx512vlbf16-builtins.c b/clang/test/CodeGen/X86/avx512vlbf16-builtins.c
similarity index 100%
rename from clang/test/CodeGen/avx512vlbf16-builtins.c
rename to clang/test/CodeGen/X86/avx512vlbf16-builtins.c
diff --git a/clang/test/CodeGen/avx512vlbitalg-builtins.c b/clang/test/CodeGen/X86/avx512vlbitalg-builtins.c
similarity index 100%
rename from clang/test/CodeGen/avx512vlbitalg-builtins.c
rename to clang/test/CodeGen/X86/avx512vlbitalg-builtins.c
diff --git a/clang/test/CodeGen/avx512vlbw-builtins.c b/clang/test/CodeGen/X86/avx512vlbw-builtins.c
similarity index 100%
rename from clang/test/CodeGen/avx512vlbw-builtins.c
rename to clang/test/CodeGen/X86/avx512vlbw-builtins.c
diff --git a/clang/test/CodeGen/avx512vlcd-builtins.c b/clang/test/CodeGen/X86/avx512vlcd-builtins.c
similarity index 100%
rename from clang/test/CodeGen/avx512vlcd-builtins.c
rename to clang/test/CodeGen/X86/avx512vlcd-builtins.c
diff --git a/clang/test/CodeGen/avx512vldq-builtins.c b/clang/test/CodeGen/X86/avx512vldq-builtins.c
similarity index 100%
rename from clang/test/CodeGen/avx512vldq-builtins.c
rename to clang/test/CodeGen/X86/avx512vldq-builtins.c
diff --git a/clang/test/CodeGen/avx512vlvbmi2-builtins.c b/clang/test/CodeGen/X86/avx512vlvbmi2-builtins.c
similarity index 100%
rename from clang/test/CodeGen/avx512vlvbmi2-builtins.c
rename to clang/test/CodeGen/X86/avx512vlvbmi2-builtins.c
diff --git a/clang/test/CodeGen/avx512vlvnni-builtins.c b/clang/test/CodeGen/X86/avx512vlvnni-builtins.c
similarity index 100%
rename from clang/test/CodeGen/avx512vlvnni-builtins.c
rename to clang/test/CodeGen/X86/avx512vlvnni-builtins.c
diff --git a/clang/test/CodeGen/avx512vnni-builtins.c b/clang/test/CodeGen/X86/avx512vnni-builtins.c
similarity index 100%
rename from clang/test/CodeGen/avx512vnni-builtins.c
rename to clang/test/CodeGen/X86/avx512vnni-builtins.c
diff --git a/clang/test/CodeGen/avx512vpopcntdqintrin.c b/clang/test/CodeGen/X86/avx512vpopcntdqintrin.c
similarity index 100%
rename from clang/test/CodeGen/avx512vpopcntdqintrin.c
rename to clang/test/CodeGen/X86/avx512vpopcntdqintrin.c
diff --git a/clang/test/CodeGen/avx512vpopcntdqvlintrin.c b/clang/test/CodeGen/X86/avx512vpopcntdqvlintrin.c
similarity index 100%
rename from clang/test/CodeGen/avx512vpopcntdqvlintrin.c
rename to clang/test/CodeGen/X86/avx512vpopcntdqvlintrin.c
diff --git a/clang/test/CodeGen/bitscan-builtins.c b/clang/test/CodeGen/X86/bitscan-builtins.c
similarity index 100%
rename from clang/test/CodeGen/bitscan-builtins.c
rename to clang/test/CodeGen/X86/bitscan-builtins.c
diff --git a/clang/test/CodeGen/bmi-builtins.c b/clang/test/CodeGen/X86/bmi-builtins.c
similarity index 100%
rename from clang/test/CodeGen/bmi-builtins.c
rename to clang/test/CodeGen/X86/bmi-builtins.c
diff --git a/clang/test/CodeGen/bmi2-builtins.c b/clang/test/CodeGen/X86/bmi2-builtins.c
similarity index 100%
rename from clang/test/CodeGen/bmi2-builtins.c
rename to clang/test/CodeGen/X86/bmi2-builtins.c
diff --git a/clang/test/CodeGen/builtin-clflushopt.c b/clang/test/CodeGen/X86/builtin-clflushopt.c
similarity index 100%
rename from clang/test/CodeGen/builtin-clflushopt.c
rename to clang/test/CodeGen/X86/builtin-clflushopt.c
diff --git a/clang/test/CodeGen/builtin-clwb.c b/clang/test/CodeGen/X86/builtin-clwb.c
similarity index 100%
rename from clang/test/CodeGen/builtin-clwb.c
rename to clang/test/CodeGen/X86/builtin-clwb.c
diff --git a/clang/test/CodeGen/builtin-clzero.c b/clang/test/CodeGen/X86/builtin-clzero.c
similarity index 100%
rename from clang/test/CodeGen/builtin-clzero.c
rename to clang/test/CodeGen/X86/builtin-clzero.c
diff --git a/clang/test/CodeGen/builtin-movdir.c b/clang/test/CodeGen/X86/builtin-movdir.c
similarity index 100%
rename from clang/test/CodeGen/builtin-movdir.c
rename to clang/test/CodeGen/X86/builtin-movdir.c
diff --git a/clang/test/CodeGen/builtin-wbinvd.c b/clang/test/CodeGen/X86/builtin-wbinvd.c
similarity index 100%
rename from clang/test/CodeGen/builtin-wbinvd.c
rename to clang/test/CodeGen/X86/builtin-wbinvd.c
diff --git a/clang/test/CodeGen/builtin-wbnoinvd.c b/clang/test/CodeGen/X86/builtin-wbnoinvd.c
similarity index 100%
rename from clang/test/CodeGen/builtin-wbnoinvd.c
rename to clang/test/CodeGen/X86/builtin-wbnoinvd.c
diff --git a/clang/test/CodeGen/cetintrin.c b/clang/test/CodeGen/X86/cetintrin.c
similarity index 100%
rename from clang/test/CodeGen/cetintrin.c
rename to clang/test/CodeGen/X86/cetintrin.c
diff --git a/clang/test/CodeGen/cldemote.c b/clang/test/CodeGen/X86/cldemote.c
similarity index 100%
rename from clang/test/CodeGen/cldemote.c
rename to clang/test/CodeGen/X86/cldemote.c
diff --git a/clang/test/CodeGen/f16c-builtins-constrained.c b/clang/test/CodeGen/X86/f16c-builtins-constrained.c
similarity index 100%
rename from clang/test/CodeGen/f16c-builtins-constrained.c
rename to clang/test/CodeGen/X86/f16c-builtins-constrained.c
diff --git a/clang/test/CodeGen/f16c-builtins.c b/clang/test/CodeGen/X86/f16c-builtins.c
similarity index 100%
rename from clang/test/CodeGen/f16c-builtins.c
rename to clang/test/CodeGen/X86/f16c-builtins.c
diff --git a/clang/test/CodeGen/fma-builtins-constrained.c b/clang/test/CodeGen/X86/fma-builtins-constrained.c
similarity index 100%
rename from clang/test/CodeGen/fma-builtins-constrained.c
rename to clang/test/CodeGen/X86/fma-builtins-constrained.c
diff --git a/clang/test/CodeGen/fma-builtins.c b/clang/test/CodeGen/X86/fma-builtins.c
similarity index 100%
rename from clang/test/CodeGen/fma-builtins.c
rename to clang/test/CodeGen/X86/fma-builtins.c
diff --git a/clang/test/CodeGen/fma4-builtins.c b/clang/test/CodeGen/X86/fma4-builtins.c
similarity index 100%
rename from clang/test/CodeGen/fma4-builtins.c
rename to clang/test/CodeGen/X86/fma4-builtins.c
diff --git a/clang/test/CodeGen/fsgsbase-builtins.c b/clang/test/CodeGen/X86/fsgsbase-builtins.c
similarity index 100%
rename from clang/test/CodeGen/fsgsbase-builtins.c
rename to clang/test/CodeGen/X86/fsgsbase-builtins.c
diff --git a/clang/test/CodeGen/gfni-builtins.c b/clang/test/CodeGen/X86/gfni-builtins.c
similarity index 100%
rename from clang/test/CodeGen/gfni-builtins.c
rename to clang/test/CodeGen/X86/gfni-builtins.c
diff --git a/clang/test/CodeGen/intel-avx512vlvp2intersect.c b/clang/test/CodeGen/X86/intel-avx512vlvp2intersect.c
similarity index 100%
rename from clang/test/CodeGen/intel-avx512vlvp2intersect.c
rename to clang/test/CodeGen/X86/intel-avx512vlvp2intersect.c
diff --git a/clang/test/CodeGen/intel-avx512vp2intersect.c b/clang/test/CodeGen/X86/intel-avx512vp2intersect.c
similarity index 100%
rename from clang/test/CodeGen/intel-avx512vp2intersect.c
rename to clang/test/CodeGen/X86/intel-avx512vp2intersect.c
diff --git a/clang/test/CodeGen/invpcid.c b/clang/test/CodeGen/X86/invpcid.c
similarity index 100%
rename from clang/test/CodeGen/invpcid.c
rename to clang/test/CodeGen/X86/invpcid.c
diff --git a/clang/test/CodeGen/lwp-builtins.c b/clang/test/CodeGen/X86/lwp-builtins.c
similarity index 100%
rename from clang/test/CodeGen/lwp-builtins.c
rename to clang/test/CodeGen/X86/lwp-builtins.c
diff --git a/clang/test/CodeGen/lzcnt-builtins.c b/clang/test/CodeGen/X86/lzcnt-builtins.c
similarity index 100%
rename from clang/test/CodeGen/lzcnt-builtins.c
rename to clang/test/CodeGen/X86/lzcnt-builtins.c
diff --git a/clang/test/CodeGen/mmx-builtins.c b/clang/test/CodeGen/X86/mmx-builtins.c
similarity index 100%
rename from clang/test/CodeGen/mmx-builtins.c
rename to clang/test/CodeGen/X86/mmx-builtins.c
diff --git a/clang/test/CodeGen/mmx-inline-asm-error.c b/clang/test/CodeGen/X86/mmx-inline-asm-error.c
similarity index 100%
rename from clang/test/CodeGen/mmx-inline-asm-error.c
rename to clang/test/CodeGen/X86/mmx-inline-asm-error.c
diff --git a/clang/test/CodeGen/mmx-inline-asm.c b/clang/test/CodeGen/X86/mmx-inline-asm.c
similarity index 100%
rename from clang/test/CodeGen/mmx-inline-asm.c
rename to clang/test/CodeGen/X86/mmx-inline-asm.c
diff --git a/clang/test/CodeGen/mmx-shift-with-immediate.c b/clang/test/CodeGen/X86/mmx-shift-with-immediate.c
similarity index 100%
rename from clang/test/CodeGen/mmx-shift-with-immediate.c
rename to clang/test/CodeGen/X86/mmx-shift-with-immediate.c
diff --git a/clang/test/CodeGen/movbe-builtins.c b/clang/test/CodeGen/X86/movbe-builtins.c
similarity index 100%
rename from clang/test/CodeGen/movbe-builtins.c
rename to clang/test/CodeGen/X86/movbe-builtins.c
diff --git a/clang/test/CodeGen/pause.c b/clang/test/CodeGen/X86/pause.c
similarity index 100%
rename from clang/test/CodeGen/pause.c
rename to clang/test/CodeGen/X86/pause.c
diff --git a/clang/test/CodeGen/pclmul-builtins.c b/clang/test/CodeGen/X86/pclmul-builtins.c
similarity index 100%
rename from clang/test/CodeGen/pclmul-builtins.c
rename to clang/test/CodeGen/X86/pclmul-builtins.c
diff --git a/clang/test/CodeGen/pku.c b/clang/test/CodeGen/X86/pku.c
similarity index 100%
rename from clang/test/CodeGen/pku.c
rename to clang/test/CodeGen/X86/pku.c
diff --git a/clang/test/CodeGen/popcnt-builtins.c b/clang/test/CodeGen/X86/popcnt-builtins.c
similarity index 100%
rename from clang/test/CodeGen/popcnt-builtins.c
rename to clang/test/CodeGen/X86/popcnt-builtins.c
diff --git a/clang/test/CodeGen/prefetchw-builtins.c b/clang/test/CodeGen/X86/prefetchw-builtins.c
similarity index 100%
rename from clang/test/CodeGen/prefetchw-builtins.c
rename to clang/test/CodeGen/X86/prefetchw-builtins.c
diff --git a/clang/test/CodeGen/ptwrite.c b/clang/test/CodeGen/X86/ptwrite.c
similarity index 100%
rename from clang/test/CodeGen/ptwrite.c
rename to clang/test/CodeGen/X86/ptwrite.c
diff --git a/clang/test/CodeGen/rd-builtins.c b/clang/test/CodeGen/X86/rd-builtins.c
similarity index 100%
rename from clang/test/CodeGen/rd-builtins.c
rename to clang/test/CodeGen/X86/rd-builtins.c
diff --git a/clang/test/CodeGen/rdpid-builtins.c b/clang/test/CodeGen/X86/rdpid-builtins.c
similarity index 100%
rename from clang/test/CodeGen/rdpid-builtins.c
rename to clang/test/CodeGen/X86/rdpid-builtins.c
diff --git a/clang/test/CodeGen/rdrand-builtins.c b/clang/test/CodeGen/X86/rdrand-builtins.c
similarity index 100%
rename from clang/test/CodeGen/rdrand-builtins.c
rename to clang/test/CodeGen/X86/rdrand-builtins.c
diff --git a/clang/test/CodeGen/rot-intrinsics.c b/clang/test/CodeGen/X86/rot-intrinsics.c
similarity index 100%
rename from clang/test/CodeGen/rot-intrinsics.c
rename to clang/test/CodeGen/X86/rot-intrinsics.c
diff --git a/clang/test/CodeGen/rtm-builtins.c b/clang/test/CodeGen/X86/rtm-builtins.c
similarity index 100%
rename from clang/test/CodeGen/rtm-builtins.c
rename to clang/test/CodeGen/X86/rtm-builtins.c
diff --git a/clang/test/CodeGen/sha-builtins.c b/clang/test/CodeGen/X86/sha-builtins.c
similarity index 100%
rename from clang/test/CodeGen/sha-builtins.c
rename to clang/test/CodeGen/X86/sha-builtins.c
diff --git a/clang/test/CodeGen/sse-builtins-constrained-cmp.c b/clang/test/CodeGen/X86/sse-builtins-constrained-cmp.c
similarity index 100%
rename from clang/test/CodeGen/sse-builtins-constrained-cmp.c
rename to clang/test/CodeGen/X86/sse-builtins-constrained-cmp.c
diff --git a/clang/test/CodeGen/sse-builtins-constrained.c b/clang/test/CodeGen/X86/sse-builtins-constrained.c
similarity index 100%
rename from clang/test/CodeGen/sse-builtins-constrained.c
rename to clang/test/CodeGen/X86/sse-builtins-constrained.c
diff --git a/clang/test/CodeGen/sse-builtins-dbg.c b/clang/test/CodeGen/X86/sse-builtins-dbg.c
similarity index 100%
rename from clang/test/CodeGen/sse-builtins-dbg.c
rename to clang/test/CodeGen/X86/sse-builtins-dbg.c
diff --git a/clang/test/CodeGen/sse-builtins.c b/clang/test/CodeGen/X86/sse-builtins.c
similarity index 100%
rename from clang/test/CodeGen/sse-builtins.c
rename to clang/test/CodeGen/X86/sse-builtins.c
diff --git a/clang/test/CodeGen/sse.c b/clang/test/CodeGen/X86/sse.c
similarity index 100%
rename from clang/test/CodeGen/sse.c
rename to clang/test/CodeGen/X86/sse.c
diff --git a/clang/test/CodeGen/sse2-builtins-constrained-cmp.c b/clang/test/CodeGen/X86/sse2-builtins-constrained-cmp.c
similarity index 100%
rename from clang/test/CodeGen/sse2-builtins-constrained-cmp.c
rename to clang/test/CodeGen/X86/sse2-builtins-constrained-cmp.c
diff --git a/clang/test/CodeGen/sse2-builtins.c b/clang/test/CodeGen/X86/sse2-builtins.c
similarity index 100%
rename from clang/test/CodeGen/sse2-builtins.c
rename to clang/test/CodeGen/X86/sse2-builtins.c
diff --git a/clang/test/CodeGen/sse3-builtins.c b/clang/test/CodeGen/X86/sse3-builtins.c
similarity index 100%
rename from clang/test/CodeGen/sse3-builtins.c
rename to clang/test/CodeGen/X86/sse3-builtins.c
diff --git a/clang/test/CodeGen/sse41-builtins.c b/clang/test/CodeGen/X86/sse41-builtins.c
similarity index 100%
rename from clang/test/CodeGen/sse41-builtins.c
rename to clang/test/CodeGen/X86/sse41-builtins.c
diff --git a/clang/test/CodeGen/sse42-builtins.c b/clang/test/CodeGen/X86/sse42-builtins.c
similarity index 100%
rename from clang/test/CodeGen/sse42-builtins.c
rename to clang/test/CodeGen/X86/sse42-builtins.c
diff --git a/clang/test/CodeGen/sse4a-builtins.c b/clang/test/CodeGen/X86/sse4a-builtins.c
similarity index 100%
rename from clang/test/CodeGen/sse4a-builtins.c
rename to clang/test/CodeGen/X86/sse4a-builtins.c
diff --git a/clang/test/CodeGen/ssse3-builtins.c b/clang/test/CodeGen/X86/ssse3-builtins.c
similarity index 100%
rename from clang/test/CodeGen/ssse3-builtins.c
rename to clang/test/CodeGen/X86/ssse3-builtins.c
diff --git a/clang/test/CodeGen/tbm-builtins.c b/clang/test/CodeGen/X86/tbm-builtins.c
similarity index 100%
rename from clang/test/CodeGen/tbm-builtins.c
rename to clang/test/CodeGen/X86/tbm-builtins.c
diff --git a/clang/test/CodeGen/vaes-builtins.c b/clang/test/CodeGen/X86/vaes-builtins.c
similarity index 100%
rename from clang/test/CodeGen/vaes-builtins.c
rename to clang/test/CodeGen/X86/vaes-builtins.c
diff --git a/clang/test/CodeGen/vpclmulqdq-builtins.c b/clang/test/CodeGen/X86/vpclmulqdq-builtins.c
similarity index 100%
rename from clang/test/CodeGen/vpclmulqdq-builtins.c
rename to clang/test/CodeGen/X86/vpclmulqdq-builtins.c
diff --git a/clang/test/CodeGen/waitpkg.c b/clang/test/CodeGen/X86/waitpkg.c
similarity index 100%
rename from clang/test/CodeGen/waitpkg.c
rename to clang/test/CodeGen/X86/waitpkg.c
diff --git a/clang/test/CodeGen/xop-builtins-cmp.c b/clang/test/CodeGen/X86/xop-builtins-cmp.c
similarity index 100%
rename from clang/test/CodeGen/xop-builtins-cmp.c
rename to clang/test/CodeGen/X86/xop-builtins-cmp.c
diff --git a/clang/test/CodeGen/xop-builtins.c b/clang/test/CodeGen/X86/xop-builtins.c
similarity index 100%
rename from clang/test/CodeGen/xop-builtins.c
rename to clang/test/CodeGen/X86/xop-builtins.c