diff --git a/clang/test/CodeGen/AArch64/debug-sve-vector-types.c b/clang/test/DebugInfo/AArch64/sve-vector-types.c
similarity index 100%
rename from clang/test/CodeGen/AArch64/debug-sve-vector-types.c
rename to clang/test/DebugInfo/AArch64/sve-vector-types.c
diff --git a/clang/test/CodeGen/AArch64/debug-sve-vectorx2-types.c b/clang/test/DebugInfo/AArch64/sve-vectorx2-types.c
similarity index 100%
rename from clang/test/CodeGen/AArch64/debug-sve-vectorx2-types.c
rename to clang/test/DebugInfo/AArch64/sve-vectorx2-types.c
diff --git a/clang/test/CodeGen/AArch64/debug-sve-vectorx3-types.c b/clang/test/DebugInfo/AArch64/sve-vectorx3-types.c
similarity index 100%
rename from clang/test/CodeGen/AArch64/debug-sve-vectorx3-types.c
rename to clang/test/DebugInfo/AArch64/sve-vectorx3-types.c
diff --git a/clang/test/CodeGen/AArch64/debug-sve-vectorx4-types.c b/clang/test/DebugInfo/AArch64/sve-vectorx4-types.c
similarity index 100%
rename from clang/test/CodeGen/AArch64/debug-sve-vectorx4-types.c
rename to clang/test/DebugInfo/AArch64/sve-vectorx4-types.c
diff --git a/clang/test/CodeGen/AArch64/debug-types.c b/clang/test/DebugInfo/AArch64/types.c
similarity index 100%
rename from clang/test/CodeGen/AArch64/debug-types.c
rename to clang/test/DebugInfo/AArch64/types.c
diff --git a/clang/test/CodeGen/assignment-tracking/assignment-tracking.cpp b/clang/test/DebugInfo/AssignmentTracking/assignment-tracking.cpp
similarity index 100%
rename from clang/test/CodeGen/assignment-tracking/assignment-tracking.cpp
rename to clang/test/DebugInfo/AssignmentTracking/assignment-tracking.cpp
diff --git a/clang/test/CodeGen/assignment-tracking/flag.cpp b/clang/test/DebugInfo/AssignmentTracking/flag.cpp
similarity index 100%
rename from clang/test/CodeGen/assignment-tracking/flag.cpp
rename to clang/test/DebugInfo/AssignmentTracking/flag.cpp
diff --git a/clang/test/CodeGen/assignment-tracking/memcpy-fragment.cpp b/clang/test/DebugInfo/AssignmentTracking/memcpy-fragment.cpp
similarity index 100%
rename from clang/test/CodeGen/assignment-tracking/memcpy-fragment.cpp
rename to clang/test/DebugInfo/AssignmentTracking/memcpy-fragment.cpp
diff --git a/clang/test/CodeGen/assignment-tracking/nested-scope.cpp b/clang/test/DebugInfo/AssignmentTracking/nested-scope.cpp
similarity index 100%
rename from clang/test/CodeGen/assignment-tracking/nested-scope.cpp
rename to clang/test/DebugInfo/AssignmentTracking/nested-scope.cpp
diff --git a/clang/test/CodeGen/attr-btf_tag-typedef.c b/clang/test/DebugInfo/BPF/attr-btf_tag-typedef.c
similarity index 100%
rename from clang/test/CodeGen/attr-btf_tag-typedef.c
rename to clang/test/DebugInfo/BPF/attr-btf_tag-typedef.c
diff --git a/clang/test/CodeGen/attr-btf_type_tag-func.c b/clang/test/DebugInfo/BPF/attr-btf_type_tag-func.c
similarity index 100%
rename from clang/test/CodeGen/attr-btf_type_tag-func.c
rename to clang/test/DebugInfo/BPF/attr-btf_type_tag-func.c
diff --git a/clang/test/CodeGen/bpf-attr-type-tag-atomic.c b/clang/test/DebugInfo/BPF/bpf-attr-type-tag-atomic.c
similarity index 100%
rename from clang/test/CodeGen/bpf-attr-type-tag-atomic.c
rename to clang/test/DebugInfo/BPF/bpf-attr-type-tag-atomic.c
diff --git a/clang/test/CodeGen/bpf-debug-info-extern-func.c b/clang/test/DebugInfo/BPF/bpf-debug-info-extern-func.c
similarity index 100%
rename from clang/test/CodeGen/bpf-debug-info-extern-func.c
rename to clang/test/DebugInfo/BPF/bpf-debug-info-extern-func.c
diff --git a/clang/test/CodeGen/builtin-preserve-access-index-nonptr.c b/clang/test/DebugInfo/BPF/builtin-preserve-access-index-nonptr.c
similarity index 100%
rename from clang/test/CodeGen/builtin-preserve-access-index-nonptr.c
rename to clang/test/DebugInfo/BPF/builtin-preserve-access-index-nonptr.c
diff --git a/clang/test/CodeGen/builtins-bpf-preserve-field-info-1.c b/clang/test/DebugInfo/BPF/builtins-bpf-preserve-field-info-1.c
similarity index 100%
rename from clang/test/CodeGen/builtins-bpf-preserve-field-info-1.c
rename to clang/test/DebugInfo/BPF/builtins-bpf-preserve-field-info-1.c
diff --git a/clang/test/CodeGen/builtins-bpf-preserve-field-info-2.c b/clang/test/DebugInfo/BPF/builtins-bpf-preserve-field-info-2.c
similarity index 100%
rename from clang/test/CodeGen/builtins-bpf-preserve-field-info-2.c
rename to clang/test/DebugInfo/BPF/builtins-bpf-preserve-field-info-2.c
diff --git a/clang/test/CodeGen/builtins-bpf-preserve-field-info-3.c b/clang/test/DebugInfo/BPF/builtins-bpf-preserve-field-info-3.c
similarity index 100%
rename from clang/test/CodeGen/builtins-bpf-preserve-field-info-3.c
rename to clang/test/DebugInfo/BPF/builtins-bpf-preserve-field-info-3.c
diff --git a/clang/test/CodeGen/builtins-bpf-preserve-field-info-4.c b/clang/test/DebugInfo/BPF/builtins-bpf-preserve-field-info-4.c
similarity index 100%
rename from clang/test/CodeGen/builtins-bpf-preserve-field-info-4.c
rename to clang/test/DebugInfo/BPF/builtins-bpf-preserve-field-info-4.c
diff --git a/clang/test/CodeGen/2007-05-11-str-const.c b/clang/test/DebugInfo/Generic/2007-05-11-str-const.c
similarity index 100%
rename from clang/test/CodeGen/2007-05-11-str-const.c
rename to clang/test/DebugInfo/Generic/2007-05-11-str-const.c
diff --git a/clang/test/CodeGen/2009-03-13-dbg.c b/clang/test/DebugInfo/Generic/2009-03-13-dbg.c
similarity index 100%
rename from clang/test/CodeGen/2009-03-13-dbg.c
rename to clang/test/DebugInfo/Generic/2009-03-13-dbg.c
diff --git a/clang/test/CodeGen/2009-04-23-dbg.c b/clang/test/DebugInfo/Generic/2009-04-23-dbg.c
similarity index 100%
rename from clang/test/CodeGen/2009-04-23-dbg.c
rename to clang/test/DebugInfo/Generic/2009-04-23-dbg.c
diff --git a/clang/test/CodeGen/2009-07-31-DbgDeclare.c b/clang/test/DebugInfo/Generic/2009-07-31-DbgDeclare.c
similarity index 100%
rename from clang/test/CodeGen/2009-07-31-DbgDeclare.c
rename to clang/test/DebugInfo/Generic/2009-07-31-DbgDeclare.c
diff --git a/clang/test/CodeGen/2010-01-14-FnType-DebugInfo.c b/clang/test/DebugInfo/Generic/2010-01-14-FnType-DebugInfo.c
similarity index 100%
rename from clang/test/CodeGen/2010-01-14-FnType-DebugInfo.c
rename to clang/test/DebugInfo/Generic/2010-01-14-FnType-DebugInfo.c
diff --git a/clang/test/CodeGen/2010-01-18-Inlined-Debug.c b/clang/test/DebugInfo/Generic/2010-01-18-Inlined-Debug.c
similarity index 100%
rename from clang/test/CodeGen/2010-01-18-Inlined-Debug.c
rename to clang/test/DebugInfo/Generic/2010-01-18-Inlined-Debug.c
diff --git a/clang/test/CodeGen/2010-02-10-PointerName.c b/clang/test/DebugInfo/Generic/2010-02-10-PointerName.c
similarity index 100%
rename from clang/test/CodeGen/2010-02-10-PointerName.c
rename to clang/test/DebugInfo/Generic/2010-02-10-PointerName.c
diff --git a/clang/test/CodeGen/2010-02-15-DbgStaticVar.c b/clang/test/DebugInfo/Generic/2010-02-15-DbgStaticVar.c
similarity index 100%
rename from clang/test/CodeGen/2010-02-15-DbgStaticVar.c
rename to clang/test/DebugInfo/Generic/2010-02-15-DbgStaticVar.c
diff --git a/clang/test/CodeGen/2010-02-16-DbgScopes.c b/clang/test/DebugInfo/Generic/2010-02-16-DbgScopes.c
similarity index 100%
rename from clang/test/CodeGen/2010-02-16-DbgScopes.c
rename to clang/test/DebugInfo/Generic/2010-02-16-DbgScopes.c
diff --git a/clang/test/CodeGen/2010-03-5-LexicalScope.c b/clang/test/DebugInfo/Generic/2010-03-5-LexicalScope.c
similarity index 100%
rename from clang/test/CodeGen/2010-03-5-LexicalScope.c
rename to clang/test/DebugInfo/Generic/2010-03-5-LexicalScope.c
diff --git a/clang/test/CodeGen/2010-07-08-DeclDebugLineNo.c b/clang/test/DebugInfo/Generic/2010-07-08-DeclDebugLineNo.c
similarity index 100%
rename from clang/test/CodeGen/2010-07-08-DeclDebugLineNo.c
rename to clang/test/DebugInfo/Generic/2010-07-08-DeclDebugLineNo.c
diff --git a/clang/test/CodeGen/2010-08-10-DbgConstant.c b/clang/test/DebugInfo/Generic/2010-08-10-DbgConstant.c
similarity index 100%
rename from clang/test/CodeGen/2010-08-10-DbgConstant.c
rename to clang/test/DebugInfo/Generic/2010-08-10-DbgConstant.c
diff --git a/clang/test/CodeGen/debug-info-257-args.c b/clang/test/DebugInfo/Generic/257-args.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-257-args.c
rename to clang/test/DebugInfo/Generic/257-args.c
diff --git a/clang/test/CodeGen/Inputs/debug-info-embed-source.c b/clang/test/DebugInfo/Generic/Inputs/debug-info-embed-source.c
similarity index 100%
rename from clang/test/CodeGen/Inputs/debug-info-embed-source.c
rename to clang/test/DebugInfo/Generic/Inputs/debug-info-embed-source.c
diff --git a/clang/test/CodeGen/Inputs/debug-info-file-checksum-line.cpp b/clang/test/DebugInfo/Generic/Inputs/debug-info-file-checksum-line.cpp
similarity index 100%
rename from clang/test/CodeGen/Inputs/debug-info-file-checksum-line.cpp
rename to clang/test/DebugInfo/Generic/Inputs/debug-info-file-checksum-line.cpp
diff --git a/clang/test/CodeGen/Inputs/debug-info-file-checksum-pre.cpp b/clang/test/DebugInfo/Generic/Inputs/debug-info-file-checksum-pre.cpp
similarity index 100%
rename from clang/test/CodeGen/Inputs/debug-info-file-checksum-pre.cpp
rename to clang/test/DebugInfo/Generic/Inputs/debug-info-file-checksum-pre.cpp
diff --git a/clang/test/CodeGen/Inputs/debug-info-file-checksum.c b/clang/test/DebugInfo/Generic/Inputs/debug-info-file-checksum.c
similarity index 100%
rename from clang/test/CodeGen/Inputs/debug-info-file-checksum.c
rename to clang/test/DebugInfo/Generic/Inputs/debug-info-file-checksum.c
diff --git a/clang/test/CodeGen/Inputs/debug-info-macro.h b/clang/test/DebugInfo/Generic/Inputs/debug-info-macro.h
similarity index 100%
rename from clang/test/CodeGen/Inputs/debug-info-macro.h
rename to clang/test/DebugInfo/Generic/Inputs/debug-info-macro.h
diff --git a/clang/test/CodeGen/Inputs/debug-info-slash.cpp b/clang/test/DebugInfo/Generic/Inputs/debug-info-slash.cpp
similarity index 100%
rename from clang/test/CodeGen/Inputs/debug-info-slash.cpp
rename to clang/test/DebugInfo/Generic/Inputs/debug-info-slash.cpp
diff --git a/clang/test/CodeGen/Inputs/debug-info-slash.h b/clang/test/DebugInfo/Generic/Inputs/debug-info-slash.h
similarity index 100%
rename from clang/test/CodeGen/Inputs/debug-info-slash.h
rename to clang/test/DebugInfo/Generic/Inputs/debug-info-slash.h
diff --git a/clang/test/DebugInfo/Generic/Inputs/stdio.h b/clang/test/DebugInfo/Generic/Inputs/stdio.h
new file mode 100644
index 0000000000000..fc49fd8247038
--- /dev/null
+++ b/clang/test/DebugInfo/Generic/Inputs/stdio.h
@@ -0,0 +1,9 @@
+struct FILE;
+extern int vfprintf(struct FILE *s, const char *format, __builtin_va_list arg);
+extern int vprintf(const char *format, __builtin_va_list arg);
+
+extern __inline __attribute__((gnu_inline,always_inline)) int
+vprintf(const char *x, __builtin_va_list y)
+{
+  return vfprintf (0, 0, y);
+}
diff --git a/clang/test/CodeGen/debug-info-abspath.c b/clang/test/DebugInfo/Generic/abspath.c
similarity index 70%
rename from clang/test/CodeGen/debug-info-abspath.c
rename to clang/test/DebugInfo/Generic/abspath.c
index 193a72c0a66fd..95bed45518f2b 100644
--- a/clang/test/CodeGen/debug-info-abspath.c
+++ b/clang/test/DebugInfo/Generic/abspath.c
@@ -1,9 +1,9 @@
 // RUN: mkdir -p %t/UNIQUEISH_SENTINEL
-// RUN: cp %s %t/UNIQUEISH_SENTINEL/debug-info-abspath.c
+// RUN: cp %s %t/UNIQUEISH_SENTINEL/abspath.c
 
 // RUN: %clang_cc1 -debug-info-kind=limited -triple %itanium_abi_triple \
-// RUN:   -fdebug-compilation-dir=%t/UNIQUEISH_SENTINEL/debug-info-abspath.c \
-// RUN:   %t/UNIQUEISH_SENTINEL/debug-info-abspath.c -emit-llvm -o - \
+// RUN:   -fdebug-compilation-dir=%t/UNIQUEISH_SENTINEL/abspath.c \
+// RUN:   %t/UNIQUEISH_SENTINEL/abspath.c -emit-llvm -o - \
 // RUN:   | FileCheck %s
 
 // RUN: cp %s %t.c
@@ -18,8 +18,8 @@ void foo(void) {}
 
 // CHECK: = distinct !DISubprogram({{.*}}file: ![[SPFILE:[0-9]+]]
 // CHECK: ![[SPFILE]] = !DIFile(filename: "{{.*}}UNIQUEISH_SENTINEL
-// CHECK-SAME:                  debug-info-abspath.c"
+// CHECK-SAME:                  abspath.c"
 // CHECK-NOT:                   directory: "{{.*}}UNIQUEISH_SENTINEL
 
 // INTREE: = distinct !DISubprogram({{.*}}![[SPFILE:[0-9]+]]
-// INTREE: DIFile({{.*}}directory: "{{.+}}CodeGen{{.*}}")
+// INTREE: DIFile({{.*}}directory: "{{.+}}Generic{{.*}}")
diff --git a/clang/test/CodeGen/debug-info-alias-pointer.c b/clang/test/DebugInfo/Generic/alias-pointer.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-alias-pointer.c
rename to clang/test/DebugInfo/Generic/alias-pointer.c
diff --git a/clang/test/CodeGen/debug-info-alias.c b/clang/test/DebugInfo/Generic/alias.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-alias.c
rename to clang/test/DebugInfo/Generic/alias.c
diff --git a/clang/test/CodeGen/amdgpu-barrier-type-debug-info.c b/clang/test/DebugInfo/Generic/amdgpu-barrier-type-debug-info.c
similarity index 100%
rename from clang/test/CodeGen/amdgpu-barrier-type-debug-info.c
rename to clang/test/DebugInfo/Generic/amdgpu-barrier-type-debug-info.c
diff --git a/clang/test/CodeGen/amdgpu-buffer-rsrc-type-debug-info.c b/clang/test/DebugInfo/Generic/amdgpu-buffer-rsrc-type-debug-info.c
similarity index 100%
rename from clang/test/CodeGen/amdgpu-buffer-rsrc-type-debug-info.c
rename to clang/test/DebugInfo/Generic/amdgpu-buffer-rsrc-type-debug-info.c
diff --git a/clang/test/CodeGen/debug-info-args.c b/clang/test/DebugInfo/Generic/args.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-args.c
rename to clang/test/DebugInfo/Generic/args.c
diff --git a/clang/test/CodeGen/artificial.c b/clang/test/DebugInfo/Generic/artificial.c
similarity index 100%
rename from clang/test/CodeGen/artificial.c
rename to clang/test/DebugInfo/Generic/artificial.c
diff --git a/clang/test/CodeGen/debug-info-atomic.c b/clang/test/DebugInfo/Generic/atomic.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-atomic.c
rename to clang/test/DebugInfo/Generic/atomic.c
diff --git a/clang/test/CodeGen/attr-btf_type_tag-func-ptr.c b/clang/test/DebugInfo/Generic/attr-btf_type_tag-func-ptr.c
similarity index 100%
rename from clang/test/CodeGen/attr-btf_type_tag-func-ptr.c
rename to clang/test/DebugInfo/Generic/attr-btf_type_tag-func-ptr.c
diff --git a/clang/test/CodeGen/attr-btf_type_tag-similar-type.c b/clang/test/DebugInfo/Generic/attr-btf_type_tag-similar-type.c
similarity index 100%
rename from clang/test/CodeGen/attr-btf_type_tag-similar-type.c
rename to clang/test/DebugInfo/Generic/attr-btf_type_tag-similar-type.c
diff --git a/clang/test/CodeGen/attr-btf_type_tag-typedef-field.c b/clang/test/DebugInfo/Generic/attr-btf_type_tag-typedef-field.c
similarity index 100%
rename from clang/test/CodeGen/attr-btf_type_tag-typedef-field.c
rename to clang/test/DebugInfo/Generic/attr-btf_type_tag-typedef-field.c
diff --git a/clang/test/CodeGen/attr-btf_type_tag-var.c b/clang/test/DebugInfo/Generic/attr-btf_type_tag-var.c
similarity index 100%
rename from clang/test/CodeGen/attr-btf_type_tag-var.c
rename to clang/test/DebugInfo/Generic/attr-btf_type_tag-var.c
diff --git a/clang/test/CodeGen/attr-counted-by-debug-info.c b/clang/test/DebugInfo/Generic/attr-counted-by-debug-info.c
similarity index 100%
rename from clang/test/CodeGen/attr-counted-by-debug-info.c
rename to clang/test/DebugInfo/Generic/attr-counted-by-debug-info.c
diff --git a/clang/test/CodeGen/attr-nodebug.c b/clang/test/DebugInfo/Generic/attr-nodebug.c
similarity index 100%
rename from clang/test/CodeGen/attr-nodebug.c
rename to clang/test/DebugInfo/Generic/attr-nodebug.c
diff --git a/clang/test/CodeGen/attr-nodebug2.c b/clang/test/DebugInfo/Generic/attr-nodebug2.c
similarity index 100%
rename from clang/test/CodeGen/attr-nodebug2.c
rename to clang/test/DebugInfo/Generic/attr-nodebug2.c
diff --git a/clang/test/CodeGen/debug-info-attributed-stmt.c b/clang/test/DebugInfo/Generic/attributed-stmt.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-attributed-stmt.c
rename to clang/test/DebugInfo/Generic/attributed-stmt.c
diff --git a/clang/test/CodeGen/debug-info-bitfield-0-struct.c b/clang/test/DebugInfo/Generic/bitfield-0-struct.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-bitfield-0-struct.c
rename to clang/test/DebugInfo/Generic/bitfield-0-struct.c
diff --git a/clang/test/CodeGen/debug-info-block-decl.c b/clang/test/DebugInfo/Generic/block-decl.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-block-decl.c
rename to clang/test/DebugInfo/Generic/block-decl.c
diff --git a/clang/test/CodeGen/debug-info-block-expr.c b/clang/test/DebugInfo/Generic/block-expr.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-block-expr.c
rename to clang/test/DebugInfo/Generic/block-expr.c
diff --git a/clang/test/CodeGen/debug-info-block-out-return.c b/clang/test/DebugInfo/Generic/block-out-return.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-block-out-return.c
rename to clang/test/DebugInfo/Generic/block-out-return.c
diff --git a/clang/test/CodeGen/debug-info-block-vars.c b/clang/test/DebugInfo/Generic/block-vars.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-block-vars.c
rename to clang/test/DebugInfo/Generic/block-vars.c
diff --git a/clang/test/CodeGen/debug-info-block.c b/clang/test/DebugInfo/Generic/block.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-block.c
rename to clang/test/DebugInfo/Generic/block.c
diff --git a/clang/test/CodeGen/bounds-checking-debuginfo.c b/clang/test/DebugInfo/Generic/bounds-checking-debuginfo.c
similarity index 100%
rename from clang/test/CodeGen/bounds-checking-debuginfo.c
rename to clang/test/DebugInfo/Generic/bounds-checking-debuginfo.c
diff --git a/clang/test/CodeGen/bpf-debug-info-unref.c b/clang/test/DebugInfo/Generic/bpf-debug-info-unref.c
similarity index 100%
rename from clang/test/CodeGen/bpf-debug-info-unref.c
rename to clang/test/DebugInfo/Generic/bpf-debug-info-unref.c
diff --git a/clang/test/CodeGen/builtin-preserve-access-index-array.c b/clang/test/DebugInfo/Generic/builtin-preserve-access-index-array.c
similarity index 100%
rename from clang/test/CodeGen/builtin-preserve-access-index-array.c
rename to clang/test/DebugInfo/Generic/builtin-preserve-access-index-array.c
diff --git a/clang/test/CodeGen/debug-info-cc.c b/clang/test/DebugInfo/Generic/cc.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-cc.c
rename to clang/test/DebugInfo/Generic/cc.c
diff --git a/clang/test/CodeGen/cfi-check-fail-debuginfo.c b/clang/test/DebugInfo/Generic/cfi-check-fail-debuginfo.c
similarity index 100%
rename from clang/test/CodeGen/cfi-check-fail-debuginfo.c
rename to clang/test/DebugInfo/Generic/cfi-check-fail-debuginfo.c
diff --git a/clang/test/CodeGen/cfi-icall-generalize-debuginfo.c b/clang/test/DebugInfo/Generic/cfi-icall-generalize-debuginfo.c
similarity index 100%
rename from clang/test/CodeGen/cfi-icall-generalize-debuginfo.c
rename to clang/test/DebugInfo/Generic/cfi-icall-generalize-debuginfo.c
diff --git a/clang/test/CodeGen/cfi-icall-normalize2-debuginfo.c b/clang/test/DebugInfo/Generic/cfi-icall-normalize2-debuginfo.c
similarity index 100%
rename from clang/test/CodeGen/cfi-icall-normalize2-debuginfo.c
rename to clang/test/DebugInfo/Generic/cfi-icall-normalize2-debuginfo.c
diff --git a/clang/test/CodeGen/debug-info-codeview-buildinfo.c b/clang/test/DebugInfo/Generic/codeview-buildinfo.c
similarity index 97%
rename from clang/test/CodeGen/debug-info-codeview-buildinfo.c
rename to clang/test/DebugInfo/Generic/codeview-buildinfo.c
index 98d249be8c883..ee6f772944d84 100644
--- a/clang/test/CodeGen/debug-info-codeview-buildinfo.c
+++ b/clang/test/DebugInfo/Generic/codeview-buildinfo.c
@@ -17,7 +17,7 @@ int main(void) { return 42; }
 // CHECK:                       Types (.debug$T)
 // CHECK: ============================================================
 // CHECK: 0x[[PWD:.+]] | LF_STRING_ID [size = {{.+}}] ID: <no type>, String: [[PWDVAL:.+]]
-// CHECK: 0x[[FILEPATH:.+]] | LF_STRING_ID [size = {{.+}}] ID: <no type>, String: [[FILEPATHVAL:.+[\\/]debug-info-codeview-buildinfo.c]]
+// CHECK: 0x[[FILEPATH:.+]] | LF_STRING_ID [size = {{.+}}] ID: <no type>, String: [[FILEPATHVAL:.+[\\/]codeview-buildinfo.c]]
 // CHECK: 0x[[ZIPDB:.+]] | LF_STRING_ID [size = {{.+}}] ID: <no type>, String:
 // CHECK: 0x[[TOOL:.+]] | LF_STRING_ID [size = {{.+}}] ID: <no type>, String: [[TOOLVAL:.+[\\/][clang|llvm].*]]
 // CHECK: 0x[[CMDLINE:.+]] | LF_STRING_ID [size = {{.+}}] ID: <no type>, String: "-cc1
diff --git a/clang/test/CodeGen/debug-info-codeview-heapallocsite.c b/clang/test/DebugInfo/Generic/codeview-heapallocsite.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-codeview-heapallocsite.c
rename to clang/test/DebugInfo/Generic/codeview-heapallocsite.c
diff --git a/clang/test/CodeGen/debug-info-codeview-unnamed.c b/clang/test/DebugInfo/Generic/codeview-unnamed.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-codeview-unnamed.c
rename to clang/test/DebugInfo/Generic/codeview-unnamed.c
diff --git a/clang/test/CodeGen/debug-info-compilation-dir.c b/clang/test/DebugInfo/Generic/compilation-dir.c
similarity index 79%
rename from clang/test/CodeGen/debug-info-compilation-dir.c
rename to clang/test/DebugInfo/Generic/compilation-dir.c
index 5f5542c525495..d2c19f298ec72 100644
--- a/clang/test/CodeGen/debug-info-compilation-dir.c
+++ b/clang/test/DebugInfo/Generic/compilation-dir.c
@@ -5,12 +5,12 @@
 // CHECK-NONSENSE: nonsense
 
 // RUN: %clang_cc1 -emit-llvm -debug-info-kind=limited %s -o - | FileCheck -check-prefix=CHECK-DIR %s
-// CHECK-DIR: CodeGen
+// CHECK-DIR: Generic
 
 /// Test path remapping.
 // RUN: %clang_cc1 -fdebug-compilation-dir=%S -main-file-name %s -emit-llvm -debug-info-kind=limited %s -o - | FileCheck -check-prefix=CHECK-ABS %s
-// CHECK-ABS: DIFile(filename: "{{.*}}debug-info-compilation-dir.c", directory: "{{.*}}CodeGen")
+// CHECK-ABS: DIFile(filename: "{{.*}}compilation-dir.c", directory: "{{.*}}Generic")
 
 // RUN: %clang_cc1 -main-file-name %s -emit-llvm -debug-info-kind=limited %s -o - | FileCheck -check-prefix=CHECK-NOMAP %s
-// CHECK-NOMAP: DIFile(filename: "{{.*}}debug-info-compilation-dir.c", directory: "")
+// CHECK-NOMAP: DIFile(filename: "{{.*}}compilation-dir.c", directory: "")
 
diff --git a/clang/test/CodeGen/debug-info-crash.c b/clang/test/DebugInfo/Generic/crash.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-crash.c
rename to clang/test/DebugInfo/Generic/crash.c
diff --git a/clang/test/CodeGen/dbg-const-int128.c b/clang/test/DebugInfo/Generic/dbg-const-int128.c
similarity index 100%
rename from clang/test/CodeGen/dbg-const-int128.c
rename to clang/test/DebugInfo/Generic/dbg-const-int128.c
diff --git a/clang/test/CodeGen/dbg-info-all-calls-described.c b/clang/test/DebugInfo/Generic/dbg-info-all-calls-described.c
similarity index 100%
rename from clang/test/CodeGen/dbg-info-all-calls-described.c
rename to clang/test/DebugInfo/Generic/dbg-info-all-calls-described.c
diff --git a/clang/test/CodeGen/debug-info.c b/clang/test/DebugInfo/Generic/debug-info.c
similarity index 100%
rename from clang/test/CodeGen/debug-info.c
rename to clang/test/DebugInfo/Generic/debug-info.c
diff --git a/clang/test/CodeGen/debug-label-inline.c b/clang/test/DebugInfo/Generic/debug-label-inline.c
similarity index 100%
rename from clang/test/CodeGen/debug-label-inline.c
rename to clang/test/DebugInfo/Generic/debug-label-inline.c
diff --git a/clang/test/CodeGen/debug-line-1.c b/clang/test/DebugInfo/Generic/debug-line-1.c
similarity index 100%
rename from clang/test/CodeGen/debug-line-1.c
rename to clang/test/DebugInfo/Generic/debug-line-1.c
diff --git a/clang/test/CodeGen/debug-prefix-map.c b/clang/test/DebugInfo/Generic/debug-prefix-map.c
similarity index 100%
rename from clang/test/CodeGen/debug-prefix-map.c
rename to clang/test/DebugInfo/Generic/debug-prefix-map.c
diff --git a/clang/test/CodeGen/debug-prefix-map.cpp b/clang/test/DebugInfo/Generic/debug-prefix-map.cpp
similarity index 100%
rename from clang/test/CodeGen/debug-prefix-map.cpp
rename to clang/test/DebugInfo/Generic/debug-prefix-map.cpp
diff --git a/clang/test/CodeGen/debug-info-embed-source.c b/clang/test/DebugInfo/Generic/embed-source.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-embed-source.c
rename to clang/test/DebugInfo/Generic/embed-source.c
diff --git a/clang/test/CodeGen/debug-info-enum-case-val.c b/clang/test/DebugInfo/Generic/enum-case-val.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-enum-case-val.c
rename to clang/test/DebugInfo/Generic/enum-case-val.c
diff --git a/clang/test/CodeGen/debug-info-enum-extensibility.c b/clang/test/DebugInfo/Generic/enum-extensibility.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-enum-extensibility.c
rename to clang/test/DebugInfo/Generic/enum-extensibility.c
diff --git a/clang/test/CodeGen/debug-info-enum.c b/clang/test/DebugInfo/Generic/enum.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-enum.c
rename to clang/test/DebugInfo/Generic/enum.c
diff --git a/clang/test/CodeGen/debug-info-enum.cpp b/clang/test/DebugInfo/Generic/enum.cpp
similarity index 100%
rename from clang/test/CodeGen/debug-info-enum.cpp
rename to clang/test/DebugInfo/Generic/enum.cpp
diff --git a/clang/test/CodeGen/enum2.c b/clang/test/DebugInfo/Generic/enum2.c
similarity index 100%
rename from clang/test/CodeGen/enum2.c
rename to clang/test/DebugInfo/Generic/enum2.c
diff --git a/clang/test/CodeGen/debug-info-extern-basic.c b/clang/test/DebugInfo/Generic/extern-basic.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-extern-basic.c
rename to clang/test/DebugInfo/Generic/extern-basic.c
diff --git a/clang/test/CodeGen/debug-info-extern-basic.cpp b/clang/test/DebugInfo/Generic/extern-basic.cpp
similarity index 100%
rename from clang/test/CodeGen/debug-info-extern-basic.cpp
rename to clang/test/DebugInfo/Generic/extern-basic.cpp
diff --git a/clang/test/CodeGen/debug-info-extern-call.c b/clang/test/DebugInfo/Generic/extern-call.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-extern-call.c
rename to clang/test/DebugInfo/Generic/extern-call.c
diff --git a/clang/test/CodeGen/debug-info-extern-callback.c b/clang/test/DebugInfo/Generic/extern-callback.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-extern-callback.c
rename to clang/test/DebugInfo/Generic/extern-callback.c
diff --git a/clang/test/CodeGen/debug-info-extern-duplicate.c b/clang/test/DebugInfo/Generic/extern-duplicate.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-extern-duplicate.c
rename to clang/test/DebugInfo/Generic/extern-duplicate.c
diff --git a/clang/test/CodeGen/debug-info-extern-multi.c b/clang/test/DebugInfo/Generic/extern-multi.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-extern-multi.c
rename to clang/test/DebugInfo/Generic/extern-multi.c
diff --git a/clang/test/CodeGen/debug-info-extern-unused.c b/clang/test/DebugInfo/Generic/extern-unused.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-extern-unused.c
rename to clang/test/DebugInfo/Generic/extern-unused.c
diff --git a/clang/test/CodeGen/fake-use-return-line.c b/clang/test/DebugInfo/Generic/fake-use-return-line.c
similarity index 100%
rename from clang/test/CodeGen/fake-use-return-line.c
rename to clang/test/DebugInfo/Generic/fake-use-return-line.c
diff --git a/clang/test/CodeGen/debug-info-file-change.c b/clang/test/DebugInfo/Generic/file-change.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-file-change.c
rename to clang/test/DebugInfo/Generic/file-change.c
diff --git a/clang/test/CodeGen/debug-info-file-checksum.c b/clang/test/DebugInfo/Generic/file-checksum.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-file-checksum.c
rename to clang/test/DebugInfo/Generic/file-checksum.c
diff --git a/clang/test/CodeGen/debug-info-gline-tables-only.c b/clang/test/DebugInfo/Generic/gline-tables-only.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-gline-tables-only.c
rename to clang/test/DebugInfo/Generic/gline-tables-only.c
diff --git a/clang/test/CodeGen/debug-info-gline-tables-only2.c b/clang/test/DebugInfo/Generic/gline-tables-only2.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-gline-tables-only2.c
rename to clang/test/DebugInfo/Generic/gline-tables-only2.c
diff --git a/clang/test/CodeGen/global-blocks-lines.c b/clang/test/DebugInfo/Generic/global-blocks-lines.c
similarity index 100%
rename from clang/test/CodeGen/global-blocks-lines.c
rename to clang/test/DebugInfo/Generic/global-blocks-lines.c
diff --git a/clang/test/CodeGen/debug-info-global-constant.c b/clang/test/DebugInfo/Generic/global-constant.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-global-constant.c
rename to clang/test/DebugInfo/Generic/global-constant.c
diff --git a/clang/test/CodeGen/debug-info-imported-entity.cpp b/clang/test/DebugInfo/Generic/imported-entity.cpp
similarity index 87%
rename from clang/test/CodeGen/debug-info-imported-entity.cpp
rename to clang/test/DebugInfo/Generic/imported-entity.cpp
index 398536e581aea..f4763c14bbc7b 100644
--- a/clang/test/CodeGen/debug-info-imported-entity.cpp
+++ b/clang/test/DebugInfo/Generic/imported-entity.cpp
@@ -7,4 +7,4 @@ using std::A; using ::A;
 // CHECK: [[Imports]] = !{[[ImportedEntity:![0-9]+]]}
 // CHECK: [[ImportedEntity]] = !DIImportedEntity(tag: DW_TAG_imported_declaration, scope: [[CompileUnit]], entity: [[STDA:![0-9]+]], file: [[FILE:![0-9]+]], line: 4)
 // CHECK: [[STDA]] = !DICompositeType(tag: DW_TAG_class_type, name: "A",
-// CHECK: [[FILE]] = !DIFile(filename: {{.*}}debug-info-imported-entity.cpp
+// CHECK: [[FILE]] = !DIFile(filename: {{.*}}imported-entity.cpp
diff --git a/clang/test/CodeGen/debug-info-inline-for.c b/clang/test/DebugInfo/Generic/inline-for.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-inline-for.c
rename to clang/test/DebugInfo/Generic/inline-for.c
diff --git a/clang/test/CodeGen/debug-label.c b/clang/test/DebugInfo/Generic/label.c
similarity index 100%
rename from clang/test/CodeGen/debug-label.c
rename to clang/test/DebugInfo/Generic/label.c
diff --git a/clang/test/CodeGen/lifetime-debuginfo-1.c b/clang/test/DebugInfo/Generic/lifetime-debuginfo-1.c
similarity index 100%
rename from clang/test/CodeGen/lifetime-debuginfo-1.c
rename to clang/test/DebugInfo/Generic/lifetime-debuginfo-1.c
diff --git a/clang/test/CodeGen/lifetime-debuginfo-2.c b/clang/test/DebugInfo/Generic/lifetime-debuginfo-2.c
similarity index 100%
rename from clang/test/CodeGen/lifetime-debuginfo-2.c
rename to clang/test/DebugInfo/Generic/lifetime-debuginfo-2.c
diff --git a/clang/test/CodeGen/debug-info-limited.c b/clang/test/DebugInfo/Generic/limited.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-limited.c
rename to clang/test/DebugInfo/Generic/limited.c
diff --git a/clang/test/CodeGen/debug-info-line.c b/clang/test/DebugInfo/Generic/line.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-line.c
rename to clang/test/DebugInfo/Generic/line.c
diff --git a/clang/test/CodeGen/debug-info-line2.c b/clang/test/DebugInfo/Generic/line2.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-line2.c
rename to clang/test/DebugInfo/Generic/line2.c
diff --git a/clang/test/CodeGen/debug-info-line3.c b/clang/test/DebugInfo/Generic/line3.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-line3.c
rename to clang/test/DebugInfo/Generic/line3.c
diff --git a/clang/test/CodeGen/debug-info-line4.c b/clang/test/DebugInfo/Generic/line4.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-line4.c
rename to clang/test/DebugInfo/Generic/line4.c
diff --git a/clang/test/CodeGen/lineno-dbginfo.c b/clang/test/DebugInfo/Generic/lineno-dbginfo.c
similarity index 100%
rename from clang/test/CodeGen/lineno-dbginfo.c
rename to clang/test/DebugInfo/Generic/lineno-dbginfo.c
diff --git a/clang/test/CodeGen/linetable-endscope.c b/clang/test/DebugInfo/Generic/linetable-endscope.c
similarity index 100%
rename from clang/test/CodeGen/linetable-endscope.c
rename to clang/test/DebugInfo/Generic/linetable-endscope.c
diff --git a/clang/test/CodeGen/debug-info-lto.c b/clang/test/DebugInfo/Generic/lto.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-lto.c
rename to clang/test/DebugInfo/Generic/lto.c
diff --git a/clang/test/CodeGen/debug-info-macro.c b/clang/test/DebugInfo/Generic/macro.c
similarity index 98%
rename from clang/test/CodeGen/debug-info-macro.c
rename to clang/test/DebugInfo/Generic/macro.c
index 23fd67515e845..de8d1ab915d7e 100644
--- a/clang/test/CodeGen/debug-info-macro.c
+++ b/clang/test/DebugInfo/Generic/macro.c
@@ -30,7 +30,7 @@
 // PCH:    [[Macros]] = !{[[MainMacroFile:![0-9]+]], [[DefineC1:![0-9]+]], [[DefineA:![0-9]+]], [[UndefC1:![0-9]+]]}
 
 // CHECK:  [[MainMacroFile]] = !DIMacroFile(file: [[MainFile:![0-9]+]], nodes: [[N1:![0-9]+]])
-// CHECK:  [[MainFile]] = !DIFile(filename: "{{.*}}debug-info-macro.c"
+// CHECK:  [[MainFile]] = !DIFile(filename: "{{.*}}macro.c"
 // CHECK:  [[N1]] = !{[[CommandLineInclude:![0-9]+]], [[DefineD1:![0-9]+]], [[FileInclude1:![0-9]+]], [[UndefD1:![0-9]+]], [[DefineD2:![0-9]+]], [[FileInclude2:![0-9]+]], [[UndefD2:![0-9]+]]}
 
 // CHECK:  [[CommandLineInclude]] = !DIMacroFile(file: [[HeaderFile:![0-9]+]], nodes: [[N2:![0-9]+]])
diff --git a/clang/test/CodeGen/debug-info-matrix-types.c b/clang/test/DebugInfo/Generic/matrix-types.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-matrix-types.c
rename to clang/test/DebugInfo/Generic/matrix-types.c
diff --git a/clang/test/CodeGen/debug-info-member.c b/clang/test/DebugInfo/Generic/member.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-member.c
rename to clang/test/DebugInfo/Generic/member.c
diff --git a/clang/test/CodeGen/mips-debug-info-bitfield.c b/clang/test/DebugInfo/Generic/mips-debug-info-bitfield.c
similarity index 100%
rename from clang/test/CodeGen/mips-debug-info-bitfield.c
rename to clang/test/DebugInfo/Generic/mips-debug-info-bitfield.c
diff --git a/clang/test/CodeGen/debug-info-names.c b/clang/test/DebugInfo/Generic/names.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-names.c
rename to clang/test/DebugInfo/Generic/names.c
diff --git a/clang/test/CodeGen/debug-info-no-inline-line-tables.c b/clang/test/DebugInfo/Generic/no-inline-line-tables.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-no-inline-line-tables.c
rename to clang/test/DebugInfo/Generic/no-inline-line-tables.c
diff --git a/clang/test/CodeGen/nodebug-attr.c b/clang/test/DebugInfo/Generic/nodebug-attr.c
similarity index 100%
rename from clang/test/CodeGen/nodebug-attr.c
rename to clang/test/DebugInfo/Generic/nodebug-attr.c
diff --git a/clang/test/CodeGen/null-sanitizer-debug-info-regression.cpp b/clang/test/DebugInfo/Generic/null-sanitizer-debug-info-regression.cpp
similarity index 100%
rename from clang/test/CodeGen/null-sanitizer-debug-info-regression.cpp
rename to clang/test/DebugInfo/Generic/null-sanitizer-debug-info-regression.cpp
diff --git a/clang/test/CodeGen/debug-nvptx.c b/clang/test/DebugInfo/Generic/nvptx.c
similarity index 100%
rename from clang/test/CodeGen/debug-nvptx.c
rename to clang/test/DebugInfo/Generic/nvptx.c
diff --git a/clang/test/CodeGen/openmp-prefix-map.c b/clang/test/DebugInfo/Generic/openmp-prefix-map.c
similarity index 100%
rename from clang/test/CodeGen/openmp-prefix-map.c
rename to clang/test/DebugInfo/Generic/openmp-prefix-map.c
diff --git a/clang/test/CodeGen/debug-info-oslog.c b/clang/test/DebugInfo/Generic/oslog.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-oslog.c
rename to clang/test/DebugInfo/Generic/oslog.c
diff --git a/clang/test/CodeGen/overloadable-debug.c b/clang/test/DebugInfo/Generic/overloadable-debug.c
similarity index 100%
rename from clang/test/CodeGen/overloadable-debug.c
rename to clang/test/DebugInfo/Generic/overloadable-debug.c
diff --git a/clang/test/CodeGen/debug-info-packed-struct.c b/clang/test/DebugInfo/Generic/packed-struct.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-packed-struct.c
rename to clang/test/DebugInfo/Generic/packed-struct.c
diff --git a/clang/test/CodeGen/pr52782-stdcall-func-decl.cpp b/clang/test/DebugInfo/Generic/pr52782-stdcall-func-decl.cpp
similarity index 100%
rename from clang/test/CodeGen/pr52782-stdcall-func-decl.cpp
rename to clang/test/DebugInfo/Generic/pr52782-stdcall-func-decl.cpp
diff --git a/clang/test/CodeGen/debug-info-preferred-type.cpp b/clang/test/DebugInfo/Generic/preferred-type.cpp
similarity index 100%
rename from clang/test/CodeGen/debug-info-preferred-type.cpp
rename to clang/test/DebugInfo/Generic/preferred-type.cpp
diff --git a/clang/test/CodeGen/preferred_name-chain.cpp b/clang/test/DebugInfo/Generic/preferred_name-chain.cpp
similarity index 100%
rename from clang/test/CodeGen/preferred_name-chain.cpp
rename to clang/test/DebugInfo/Generic/preferred_name-chain.cpp
diff --git a/clang/test/CodeGen/preferred_name.cpp b/clang/test/DebugInfo/Generic/preferred_name.cpp
similarity index 100%
rename from clang/test/CodeGen/preferred_name.cpp
rename to clang/test/DebugInfo/Generic/preferred_name.cpp
diff --git a/clang/test/CodeGen/debug-info-preprocessed-file.i b/clang/test/DebugInfo/Generic/preprocessed-file.i
similarity index 100%
rename from clang/test/CodeGen/debug-info-preprocessed-file.i
rename to clang/test/DebugInfo/Generic/preprocessed-file.i
diff --git a/clang/test/CodeGen/debug-info-programming-language.c b/clang/test/DebugInfo/Generic/programming-language.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-programming-language.c
rename to clang/test/DebugInfo/Generic/programming-language.c
diff --git a/clang/test/CodeGen/debug-info-pseudo-probe.cpp b/clang/test/DebugInfo/Generic/pseudo-probe.cpp
similarity index 100%
rename from clang/test/CodeGen/debug-info-pseudo-probe.cpp
rename to clang/test/DebugInfo/Generic/pseudo-probe.cpp
diff --git a/clang/test/CodeGen/ptrauth-debuginfo.c b/clang/test/DebugInfo/Generic/ptrauth-debuginfo.c
similarity index 100%
rename from clang/test/CodeGen/ptrauth-debuginfo.c
rename to clang/test/DebugInfo/Generic/ptrauth-debuginfo.c
diff --git a/clang/test/CodeGen/debug-info-ranges-base-address.c b/clang/test/DebugInfo/Generic/ranges-base-address.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-ranges-base-address.c
rename to clang/test/DebugInfo/Generic/ranges-base-address.c
diff --git a/clang/test/CodeGen/debug-info-same-line.c b/clang/test/DebugInfo/Generic/same-line.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-same-line.c
rename to clang/test/DebugInfo/Generic/same-line.c
diff --git a/clang/test/CodeGen/debug-info-scope-file.c b/clang/test/DebugInfo/Generic/scope-file.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-scope-file.c
rename to clang/test/DebugInfo/Generic/scope-file.c
diff --git a/clang/test/CodeGen/debug-info-scope.c b/clang/test/DebugInfo/Generic/scope.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-scope.c
rename to clang/test/DebugInfo/Generic/scope.c
diff --git a/clang/test/CodeGen/debug-info-slash.c b/clang/test/DebugInfo/Generic/slash.c
similarity index 70%
rename from clang/test/CodeGen/debug-info-slash.c
rename to clang/test/DebugInfo/Generic/slash.c
index 56e51c09e5b0e..02187d077d45b 100644
--- a/clang/test/CodeGen/debug-info-slash.c
+++ b/clang/test/DebugInfo/Generic/slash.c
@@ -2,5 +2,5 @@
 // RUN: %clang -target x86_64-linux-gnu  -ffile-reproducible -emit-llvm -S -g %s -o - | FileCheck --check-prefix=LINUX %s
 int main() { return 0; }
 
-// WIN:   !DIFile(filename: "{{.*}}\\debug-info-slash.c"
-// LINUX: !DIFile(filename: "{{.*}}/debug-info-slash.c"
+// WIN:   !DIFile(filename: "{{.*}}\\slash.c"
+// LINUX: !DIFile(filename: "{{.*}}/slash.c"
diff --git a/clang/test/CodeGen/debug-info-slash.test b/clang/test/DebugInfo/Generic/slash.test
similarity index 100%
rename from clang/test/CodeGen/debug-info-slash.test
rename to clang/test/DebugInfo/Generic/slash.test
diff --git a/clang/test/CodeGen/split-debug-filename.c b/clang/test/DebugInfo/Generic/split-debug-filename.c
similarity index 100%
rename from clang/test/CodeGen/split-debug-filename.c
rename to clang/test/DebugInfo/Generic/split-debug-filename.c
diff --git a/clang/test/CodeGen/split-debug-inlining.c b/clang/test/DebugInfo/Generic/split-debug-inlining.c
similarity index 100%
rename from clang/test/CodeGen/split-debug-inlining.c
rename to clang/test/DebugInfo/Generic/split-debug-inlining.c
diff --git a/clang/test/CodeGen/split-debug-output.c b/clang/test/DebugInfo/Generic/split-debug-output.c
similarity index 100%
rename from clang/test/CodeGen/split-debug-output.c
rename to clang/test/DebugInfo/Generic/split-debug-output.c
diff --git a/clang/test/CodeGen/split-debug-single-file.c b/clang/test/DebugInfo/Generic/split-debug-single-file.c
similarity index 100%
rename from clang/test/CodeGen/split-debug-single-file.c
rename to clang/test/DebugInfo/Generic/split-debug-single-file.c
diff --git a/clang/test/CodeGen/debug-info-static-const-fp.c b/clang/test/DebugInfo/Generic/static-const-fp.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-static-const-fp.c
rename to clang/test/DebugInfo/Generic/static-const-fp.c
diff --git a/clang/test/CodeGen/debug-info-static.c b/clang/test/DebugInfo/Generic/static.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-static.c
rename to clang/test/DebugInfo/Generic/static.c
diff --git a/clang/test/CodeGen/debug-info-switch-fallthrough.c b/clang/test/DebugInfo/Generic/switch-fallthrough.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-switch-fallthrough.c
rename to clang/test/DebugInfo/Generic/switch-fallthrough.c
diff --git a/clang/test/CodeGen/debug-info-sysroot-sdk.c b/clang/test/DebugInfo/Generic/sysroot-sdk.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-sysroot-sdk.c
rename to clang/test/DebugInfo/Generic/sysroot-sdk.c
diff --git a/clang/test/CodeGen/thinlto-split-dwarf.c b/clang/test/DebugInfo/Generic/thinlto-split-dwarf.c
similarity index 100%
rename from clang/test/CodeGen/thinlto-split-dwarf.c
rename to clang/test/DebugInfo/Generic/thinlto-split-dwarf.c
diff --git a/clang/test/CodeGen/debug-info-typedef.c b/clang/test/DebugInfo/Generic/typedef.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-typedef.c
rename to clang/test/DebugInfo/Generic/typedef.c
diff --git a/clang/test/CodeGen/ubsan-debuglog-return.c b/clang/test/DebugInfo/Generic/ubsan-debuglog-return.c
similarity index 100%
rename from clang/test/CodeGen/ubsan-debuglog-return.c
rename to clang/test/DebugInfo/Generic/ubsan-debuglog-return.c
diff --git a/clang/test/CodeGen/ubsan-function-debuginfo.c b/clang/test/DebugInfo/Generic/ubsan-function-debuginfo.c
similarity index 100%
rename from clang/test/CodeGen/ubsan-function-debuginfo.c
rename to clang/test/DebugInfo/Generic/ubsan-function-debuginfo.c
diff --git a/clang/test/CodeGen/ubsan-trap-debugloc.c b/clang/test/DebugInfo/Generic/ubsan-trap-debugloc.c
similarity index 100%
rename from clang/test/CodeGen/ubsan-trap-debugloc.c
rename to clang/test/DebugInfo/Generic/ubsan-trap-debugloc.c
diff --git a/clang/test/CodeGen/ubsan-trap-reason-add-overflow.c b/clang/test/DebugInfo/Generic/ubsan-trap-reason-add-overflow.c
similarity index 100%
rename from clang/test/CodeGen/ubsan-trap-reason-add-overflow.c
rename to clang/test/DebugInfo/Generic/ubsan-trap-reason-add-overflow.c
diff --git a/clang/test/CodeGen/ubsan-trap-reason-alignment-assumption.c b/clang/test/DebugInfo/Generic/ubsan-trap-reason-alignment-assumption.c
similarity index 100%
rename from clang/test/CodeGen/ubsan-trap-reason-alignment-assumption.c
rename to clang/test/DebugInfo/Generic/ubsan-trap-reason-alignment-assumption.c
diff --git a/clang/test/CodeGen/ubsan-trap-reason-builtin-unreachable.c b/clang/test/DebugInfo/Generic/ubsan-trap-reason-builtin-unreachable.c
similarity index 100%
rename from clang/test/CodeGen/ubsan-trap-reason-builtin-unreachable.c
rename to clang/test/DebugInfo/Generic/ubsan-trap-reason-builtin-unreachable.c
diff --git a/clang/test/CodeGen/ubsan-trap-reason-cfi-check-fail.c b/clang/test/DebugInfo/Generic/ubsan-trap-reason-cfi-check-fail.c
similarity index 100%
rename from clang/test/CodeGen/ubsan-trap-reason-cfi-check-fail.c
rename to clang/test/DebugInfo/Generic/ubsan-trap-reason-cfi-check-fail.c
diff --git a/clang/test/CodeGen/ubsan-trap-reason-crash.cpp b/clang/test/DebugInfo/Generic/ubsan-trap-reason-crash.cpp
similarity index 100%
rename from clang/test/CodeGen/ubsan-trap-reason-crash.cpp
rename to clang/test/DebugInfo/Generic/ubsan-trap-reason-crash.cpp
diff --git a/clang/test/CodeGen/ubsan-trap-reason-div-rem-overflow.c b/clang/test/DebugInfo/Generic/ubsan-trap-reason-div-rem-overflow.c
similarity index 100%
rename from clang/test/CodeGen/ubsan-trap-reason-div-rem-overflow.c
rename to clang/test/DebugInfo/Generic/ubsan-trap-reason-div-rem-overflow.c
diff --git a/clang/test/CodeGen/ubsan-trap-reason-dynamic-type-cache-miss.cpp b/clang/test/DebugInfo/Generic/ubsan-trap-reason-dynamic-type-cache-miss.cpp
similarity index 100%
rename from clang/test/CodeGen/ubsan-trap-reason-dynamic-type-cache-miss.cpp
rename to clang/test/DebugInfo/Generic/ubsan-trap-reason-dynamic-type-cache-miss.cpp
diff --git a/clang/test/CodeGen/ubsan-trap-reason-flag.c b/clang/test/DebugInfo/Generic/ubsan-trap-reason-flag.c
similarity index 100%
rename from clang/test/CodeGen/ubsan-trap-reason-flag.c
rename to clang/test/DebugInfo/Generic/ubsan-trap-reason-flag.c
diff --git a/clang/test/CodeGen/ubsan-trap-reason-float-cast-overflow.c b/clang/test/DebugInfo/Generic/ubsan-trap-reason-float-cast-overflow.c
similarity index 100%
rename from clang/test/CodeGen/ubsan-trap-reason-float-cast-overflow.c
rename to clang/test/DebugInfo/Generic/ubsan-trap-reason-float-cast-overflow.c
diff --git a/clang/test/CodeGen/ubsan-trap-reason-function-type-mismatch.c b/clang/test/DebugInfo/Generic/ubsan-trap-reason-function-type-mismatch.c
similarity index 100%
rename from clang/test/CodeGen/ubsan-trap-reason-function-type-mismatch.c
rename to clang/test/DebugInfo/Generic/ubsan-trap-reason-function-type-mismatch.c
diff --git a/clang/test/CodeGen/ubsan-trap-reason-implicit-conversion.c b/clang/test/DebugInfo/Generic/ubsan-trap-reason-implicit-conversion.c
similarity index 100%
rename from clang/test/CodeGen/ubsan-trap-reason-implicit-conversion.c
rename to clang/test/DebugInfo/Generic/ubsan-trap-reason-implicit-conversion.c
diff --git a/clang/test/CodeGen/ubsan-trap-reason-invalid-builtin.c b/clang/test/DebugInfo/Generic/ubsan-trap-reason-invalid-builtin.c
similarity index 100%
rename from clang/test/CodeGen/ubsan-trap-reason-invalid-builtin.c
rename to clang/test/DebugInfo/Generic/ubsan-trap-reason-invalid-builtin.c
diff --git a/clang/test/CodeGen/ubsan-trap-reason-invalid-objc-cast.m b/clang/test/DebugInfo/Generic/ubsan-trap-reason-invalid-objc-cast.m
similarity index 100%
rename from clang/test/CodeGen/ubsan-trap-reason-invalid-objc-cast.m
rename to clang/test/DebugInfo/Generic/ubsan-trap-reason-invalid-objc-cast.m
diff --git a/clang/test/CodeGen/ubsan-trap-reason-load-invalid-value.c b/clang/test/DebugInfo/Generic/ubsan-trap-reason-load-invalid-value.c
similarity index 100%
rename from clang/test/CodeGen/ubsan-trap-reason-load-invalid-value.c
rename to clang/test/DebugInfo/Generic/ubsan-trap-reason-load-invalid-value.c
diff --git a/clang/test/CodeGen/ubsan-trap-reason-missing-return.cpp b/clang/test/DebugInfo/Generic/ubsan-trap-reason-missing-return.cpp
similarity index 100%
rename from clang/test/CodeGen/ubsan-trap-reason-missing-return.cpp
rename to clang/test/DebugInfo/Generic/ubsan-trap-reason-missing-return.cpp
diff --git a/clang/test/CodeGen/ubsan-trap-reason-mul-overflow.c b/clang/test/DebugInfo/Generic/ubsan-trap-reason-mul-overflow.c
similarity index 100%
rename from clang/test/CodeGen/ubsan-trap-reason-mul-overflow.c
rename to clang/test/DebugInfo/Generic/ubsan-trap-reason-mul-overflow.c
diff --git a/clang/test/CodeGen/ubsan-trap-reason-negate-overflow.c b/clang/test/DebugInfo/Generic/ubsan-trap-reason-negate-overflow.c
similarity index 100%
rename from clang/test/CodeGen/ubsan-trap-reason-negate-overflow.c
rename to clang/test/DebugInfo/Generic/ubsan-trap-reason-negate-overflow.c
diff --git a/clang/test/CodeGen/ubsan-trap-reason-nonnull-arg.c b/clang/test/DebugInfo/Generic/ubsan-trap-reason-nonnull-arg.c
similarity index 100%
rename from clang/test/CodeGen/ubsan-trap-reason-nonnull-arg.c
rename to clang/test/DebugInfo/Generic/ubsan-trap-reason-nonnull-arg.c
diff --git a/clang/test/CodeGen/ubsan-trap-reason-nonnull-return.c b/clang/test/DebugInfo/Generic/ubsan-trap-reason-nonnull-return.c
similarity index 100%
rename from clang/test/CodeGen/ubsan-trap-reason-nonnull-return.c
rename to clang/test/DebugInfo/Generic/ubsan-trap-reason-nonnull-return.c
diff --git a/clang/test/CodeGen/ubsan-trap-reason-nullability-arg.c b/clang/test/DebugInfo/Generic/ubsan-trap-reason-nullability-arg.c
similarity index 100%
rename from clang/test/CodeGen/ubsan-trap-reason-nullability-arg.c
rename to clang/test/DebugInfo/Generic/ubsan-trap-reason-nullability-arg.c
diff --git a/clang/test/CodeGen/ubsan-trap-reason-nullability-return.c b/clang/test/DebugInfo/Generic/ubsan-trap-reason-nullability-return.c
similarity index 100%
rename from clang/test/CodeGen/ubsan-trap-reason-nullability-return.c
rename to clang/test/DebugInfo/Generic/ubsan-trap-reason-nullability-return.c
diff --git a/clang/test/CodeGen/ubsan-trap-reason-out-of-bounds.c b/clang/test/DebugInfo/Generic/ubsan-trap-reason-out-of-bounds.c
similarity index 100%
rename from clang/test/CodeGen/ubsan-trap-reason-out-of-bounds.c
rename to clang/test/DebugInfo/Generic/ubsan-trap-reason-out-of-bounds.c
diff --git a/clang/test/CodeGen/ubsan-trap-reason-pointer-overflow.c b/clang/test/DebugInfo/Generic/ubsan-trap-reason-pointer-overflow.c
similarity index 100%
rename from clang/test/CodeGen/ubsan-trap-reason-pointer-overflow.c
rename to clang/test/DebugInfo/Generic/ubsan-trap-reason-pointer-overflow.c
diff --git a/clang/test/CodeGen/ubsan-trap-reason-shift-out-of-bounds.c b/clang/test/DebugInfo/Generic/ubsan-trap-reason-shift-out-of-bounds.c
similarity index 100%
rename from clang/test/CodeGen/ubsan-trap-reason-shift-out-of-bounds.c
rename to clang/test/DebugInfo/Generic/ubsan-trap-reason-shift-out-of-bounds.c
diff --git a/clang/test/CodeGen/ubsan-trap-reason-sub-overflow.c b/clang/test/DebugInfo/Generic/ubsan-trap-reason-sub-overflow.c
similarity index 100%
rename from clang/test/CodeGen/ubsan-trap-reason-sub-overflow.c
rename to clang/test/DebugInfo/Generic/ubsan-trap-reason-sub-overflow.c
diff --git a/clang/test/CodeGen/ubsan-trap-reason-type-mismatch.c b/clang/test/DebugInfo/Generic/ubsan-trap-reason-type-mismatch.c
similarity index 100%
rename from clang/test/CodeGen/ubsan-trap-reason-type-mismatch.c
rename to clang/test/DebugInfo/Generic/ubsan-trap-reason-type-mismatch.c
diff --git a/clang/test/CodeGen/ubsan-trap-reason-vla-bound-not-positive.c b/clang/test/DebugInfo/Generic/ubsan-trap-reason-vla-bound-not-positive.c
similarity index 100%
rename from clang/test/CodeGen/ubsan-trap-reason-vla-bound-not-positive.c
rename to clang/test/DebugInfo/Generic/ubsan-trap-reason-vla-bound-not-positive.c
diff --git a/clang/test/CodeGen/unique-internal-linkage-names-dwarf.c b/clang/test/DebugInfo/Generic/unique-internal-linkage-names-dwarf.c
similarity index 100%
rename from clang/test/CodeGen/unique-internal-linkage-names-dwarf.c
rename to clang/test/DebugInfo/Generic/unique-internal-linkage-names-dwarf.c
diff --git a/clang/test/CodeGen/unique-internal-linkage-names-dwarf.cpp b/clang/test/DebugInfo/Generic/unique-internal-linkage-names-dwarf.cpp
similarity index 100%
rename from clang/test/CodeGen/unique-internal-linkage-names-dwarf.cpp
rename to clang/test/DebugInfo/Generic/unique-internal-linkage-names-dwarf.cpp
diff --git a/clang/test/CodeGen/unsigned-promotion-debuginfo.c b/clang/test/DebugInfo/Generic/unsigned-promotion-debuginfo.c
similarity index 100%
rename from clang/test/CodeGen/unsigned-promotion-debuginfo.c
rename to clang/test/DebugInfo/Generic/unsigned-promotion-debuginfo.c
diff --git a/clang/test/CodeGen/debug-info-unused-types.c b/clang/test/DebugInfo/Generic/unused-types.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-unused-types.c
rename to clang/test/DebugInfo/Generic/unused-types.c
diff --git a/clang/test/CodeGen/debug-info-unused-types.cpp b/clang/test/DebugInfo/Generic/unused-types.cpp
similarity index 100%
rename from clang/test/CodeGen/debug-info-unused-types.cpp
rename to clang/test/DebugInfo/Generic/unused-types.cpp
diff --git a/clang/test/CodeGen/unused_nested_enump.cpp b/clang/test/DebugInfo/Generic/unused_nested_enump.cpp
similarity index 100%
rename from clang/test/CodeGen/unused_nested_enump.cpp
rename to clang/test/DebugInfo/Generic/unused_nested_enump.cpp
diff --git a/clang/test/CodeGen/debug-info-variables.c b/clang/test/DebugInfo/Generic/variables.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-variables.c
rename to clang/test/DebugInfo/Generic/variables.c
diff --git a/clang/test/CodeGen/debug-info-vector-bool.c b/clang/test/DebugInfo/Generic/vector-bool.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-vector-bool.c
rename to clang/test/DebugInfo/Generic/vector-bool.c
diff --git a/clang/test/CodeGen/debug-info-vector.c b/clang/test/DebugInfo/Generic/vector.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-vector.c
rename to clang/test/DebugInfo/Generic/vector.c
diff --git a/clang/test/CodeGen/debug-info-version-coff.c b/clang/test/DebugInfo/Generic/version-coff.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-version-coff.c
rename to clang/test/DebugInfo/Generic/version-coff.c
diff --git a/clang/test/CodeGen/debug-info-version.c b/clang/test/DebugInfo/Generic/version.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-version.c
rename to clang/test/DebugInfo/Generic/version.c
diff --git a/clang/test/CodeGen/debug-info-vla.c b/clang/test/DebugInfo/Generic/vla.c
similarity index 100%
rename from clang/test/CodeGen/debug-info-vla.c
rename to clang/test/DebugInfo/Generic/vla.c
diff --git a/clang/test/CodeGen/RISCV/riscv-v-debuginfo.c b/clang/test/DebugInfo/RISCV/riscv-v-debuginfo.c
similarity index 100%
rename from clang/test/CodeGen/RISCV/riscv-v-debuginfo.c
rename to clang/test/DebugInfo/RISCV/riscv-v-debuginfo.c
diff --git a/clang/test/CodeGen/X86/i128-debuginfo.c b/clang/test/DebugInfo/X86/i128-debuginfo.c
similarity index 100%
rename from clang/test/CodeGen/X86/i128-debuginfo.c
rename to clang/test/DebugInfo/X86/i128-debuginfo.c