diff --git a/clang/test/Sema/aix-attr-align.c b/clang/test/Sema/PowerPC/aix-attr-align.c
similarity index 100%
rename from clang/test/Sema/aix-attr-align.c
rename to clang/test/Sema/PowerPC/aix-attr-align.c
diff --git a/clang/test/Sema/aix-attr-aligned-vector-warn.c b/clang/test/Sema/PowerPC/aix-attr-aligned-vector-warn.c
similarity index 100%
rename from clang/test/Sema/aix-attr-aligned-vector-warn.c
rename to clang/test/Sema/PowerPC/aix-attr-aligned-vector-warn.c
diff --git a/clang/test/Sema/aix-attr-aligned-vector-warn.cpp b/clang/test/Sema/PowerPC/aix-attr-aligned-vector-warn.cpp
similarity index 100%
rename from clang/test/Sema/aix-attr-aligned-vector-warn.cpp
rename to clang/test/Sema/PowerPC/aix-attr-aligned-vector-warn.cpp
diff --git a/clang/test/Sema/aix-attr-tls_model.c b/clang/test/Sema/PowerPC/aix-attr-tls_model.c
similarity index 100%
rename from clang/test/Sema/aix-attr-tls_model.c
rename to clang/test/Sema/PowerPC/aix-attr-tls_model.c
diff --git a/clang/test/Sema/aix-builtin-cpu-unsupports.c b/clang/test/Sema/PowerPC/aix-builtin-cpu-unsupports.c
similarity index 100%
rename from clang/test/Sema/aix-builtin-cpu-unsupports.c
rename to clang/test/Sema/PowerPC/aix-builtin-cpu-unsupports.c
diff --git a/clang/test/Sema/aix-pragma-align-packed-warn.c b/clang/test/Sema/PowerPC/aix-pragma-align-packed-warn.c
similarity index 100%
rename from clang/test/Sema/aix-pragma-align-packed-warn.c
rename to clang/test/Sema/PowerPC/aix-pragma-align-packed-warn.c
diff --git a/clang/test/Sema/aix-pragma-pack-and-align.c b/clang/test/Sema/PowerPC/aix-pragma-pack-and-align.c
similarity index 100%
rename from clang/test/Sema/aix-pragma-pack-and-align.c
rename to clang/test/Sema/PowerPC/aix-pragma-pack-and-align.c
diff --git a/clang/test/Sema/altivec-generic-overload.c b/clang/test/Sema/PowerPC/altivec-generic-overload.c
similarity index 100%
rename from clang/test/Sema/altivec-generic-overload.c
rename to clang/test/Sema/PowerPC/altivec-generic-overload.c
diff --git a/clang/test/Sema/altivec-init.c b/clang/test/Sema/PowerPC/altivec-init.c
similarity index 100%
rename from clang/test/Sema/altivec-init.c
rename to clang/test/Sema/PowerPC/altivec-init.c
diff --git a/clang/test/Sema/builtin-cpu-unsupports-AIX-Os.c b/clang/test/Sema/PowerPC/builtin-cpu-unsupports-AIX-Os.c
similarity index 100%
rename from clang/test/Sema/builtin-cpu-unsupports-AIX-Os.c
rename to clang/test/Sema/PowerPC/builtin-cpu-unsupports-AIX-Os.c
diff --git a/clang/test/Sema/builtins-bcd-format-conversion.c b/clang/test/Sema/PowerPC/builtins-bcd-format-conversion.c
similarity index 100%
rename from clang/test/Sema/builtins-bcd-format-conversion.c
rename to clang/test/Sema/PowerPC/builtins-bcd-format-conversion.c
diff --git a/clang/test/Sema/builtins-bcd-transform.c b/clang/test/Sema/PowerPC/builtins-bcd-transform.c
similarity index 100%
rename from clang/test/Sema/builtins-bcd-transform.c
rename to clang/test/Sema/PowerPC/builtins-bcd-transform.c
diff --git a/clang/test/CodeGen/PowerPC/builtins-ppc-error.c b/clang/test/Sema/PowerPC/builtins-ppc-error.c
similarity index 100%
rename from clang/test/CodeGen/PowerPC/builtins-ppc-error.c
rename to clang/test/Sema/PowerPC/builtins-ppc-error.c
diff --git a/clang/test/CodeGen/PowerPC/builtins-ppc-p10vector-error.c b/clang/test/Sema/PowerPC/builtins-ppc-p10vector-error.c
similarity index 100%
rename from clang/test/CodeGen/PowerPC/builtins-ppc-p10vector-error.c
rename to clang/test/Sema/PowerPC/builtins-ppc-p10vector-error.c
diff --git a/clang/test/CodeGen/PowerPC/builtins-ppc-xlcompat-cas-error.c b/clang/test/Sema/PowerPC/builtins-ppc-xlcompat-cas-error.c
similarity index 100%
rename from clang/test/CodeGen/PowerPC/builtins-ppc-xlcompat-cas-error.c
rename to clang/test/Sema/PowerPC/builtins-ppc-xlcompat-cas-error.c
diff --git a/clang/test/CodeGen/PowerPC/builtins-ppc-xlcompat-error.c b/clang/test/Sema/PowerPC/builtins-ppc-xlcompat-error.c
similarity index 100%
rename from clang/test/CodeGen/PowerPC/builtins-ppc-xlcompat-error.c
rename to clang/test/Sema/PowerPC/builtins-ppc-xlcompat-error.c
diff --git a/clang/test/CodeGen/PowerPC/builtins-ppc-xlcompat-fetch-error.c b/clang/test/Sema/PowerPC/builtins-ppc-xlcompat-fetch-error.c
similarity index 100%
rename from clang/test/CodeGen/PowerPC/builtins-ppc-xlcompat-fetch-error.c
rename to clang/test/Sema/PowerPC/builtins-ppc-xlcompat-fetch-error.c
diff --git a/clang/test/CodeGen/PowerPC/builtins-ppc-xlcompat-pwr9-error.c b/clang/test/Sema/PowerPC/builtins-ppc-xlcompat-pwr9-error.c
similarity index 100%
rename from clang/test/CodeGen/PowerPC/builtins-ppc-xlcompat-pwr9-error.c
rename to clang/test/Sema/PowerPC/builtins-ppc-xlcompat-pwr9-error.c
diff --git a/clang/test/CodeGen/PowerPC/builtins-ppc-xlcompat-pwr9-warning.c b/clang/test/Sema/PowerPC/builtins-ppc-xlcompat-pwr9-warning.c
similarity index 100%
rename from clang/test/CodeGen/PowerPC/builtins-ppc-xlcompat-pwr9-warning.c
rename to clang/test/Sema/PowerPC/builtins-ppc-xlcompat-pwr9-warning.c
diff --git a/clang/test/CodeGen/PowerPC/builtins-ppc-xlcompat-vec-error.c b/clang/test/Sema/PowerPC/builtins-ppc-xlcompat-vec-error.c
similarity index 100%
rename from clang/test/CodeGen/PowerPC/builtins-ppc-xlcompat-vec-error.c
rename to clang/test/Sema/PowerPC/builtins-ppc-xlcompat-vec-error.c
diff --git a/clang/test/Sema/builtins-ppc.c b/clang/test/Sema/PowerPC/builtins-ppc.c
similarity index 100%
rename from clang/test/Sema/builtins-ppc.c
rename to clang/test/Sema/PowerPC/builtins-ppc.c
diff --git a/clang/test/Sema/float128-ld-incompatibility.cpp b/clang/test/Sema/PowerPC/float128-ld-incompatibility.cpp
similarity index 100%
rename from clang/test/Sema/float128-ld-incompatibility.cpp
rename to clang/test/Sema/PowerPC/float128-ld-incompatibility.cpp
diff --git a/clang/test/Sema/libbuiltins-ctype-powerpc64.c b/clang/test/Sema/PowerPC/libbuiltins-ctype-powerpc64.c
similarity index 100%
rename from clang/test/Sema/libbuiltins-ctype-powerpc64.c
rename to clang/test/Sema/PowerPC/libbuiltins-ctype-powerpc64.c
diff --git a/clang/test/Sema/ppc-attr-target-inline.c b/clang/test/Sema/PowerPC/ppc-attr-target-inline.c
similarity index 100%
rename from clang/test/Sema/ppc-attr-target-inline.c
rename to clang/test/Sema/PowerPC/ppc-attr-target-inline.c
diff --git a/clang/test/Sema/ppc-bool.c b/clang/test/Sema/PowerPC/ppc-bool.c
similarity index 100%
rename from clang/test/Sema/ppc-bool.c
rename to clang/test/Sema/PowerPC/ppc-bool.c
diff --git a/clang/test/Sema/ppc-dmf-types.c b/clang/test/Sema/PowerPC/ppc-dmf-types.c
similarity index 100%
rename from clang/test/Sema/ppc-dmf-types.c
rename to clang/test/Sema/PowerPC/ppc-dmf-types.c
diff --git a/clang/test/Sema/ppc-pair-mma-types.c b/clang/test/Sema/PowerPC/ppc-pair-mma-types.c
similarity index 100%
rename from clang/test/Sema/ppc-pair-mma-types.c
rename to clang/test/Sema/PowerPC/ppc-pair-mma-types.c
diff --git a/clang/test/Sema/varargs-aix.c b/clang/test/Sema/PowerPC/varargs-aix.c
similarity index 100%
rename from clang/test/Sema/varargs-aix.c
rename to clang/test/Sema/PowerPC/varargs-aix.c