diff --git a/clang/test/CIR/CodeGen/X86/avx-builtins.c b/clang/test/CIR/CodeGenBuiltins/X86/avx-builtins.c
similarity index 100%
rename from clang/test/CIR/CodeGen/X86/avx-builtins.c
rename to clang/test/CIR/CodeGenBuiltins/X86/avx-builtins.c
diff --git a/clang/test/CIR/CodeGen/X86/avx10_2_512bf16-builtins.c b/clang/test/CIR/CodeGenBuiltins/X86/avx10_2_512bf16-builtins.c
similarity index 100%
rename from clang/test/CIR/CodeGen/X86/avx10_2_512bf16-builtins.c
rename to clang/test/CIR/CodeGenBuiltins/X86/avx10_2_512bf16-builtins.c
diff --git a/clang/test/CIR/CodeGen/X86/avx10_2bf16-builtins.c b/clang/test/CIR/CodeGenBuiltins/X86/avx10_2bf16-builtins.c
similarity index 100%
rename from clang/test/CIR/CodeGen/X86/avx10_2bf16-builtins.c
rename to clang/test/CIR/CodeGenBuiltins/X86/avx10_2bf16-builtins.c
diff --git a/clang/test/CIR/CodeGen/X86/avx512bw-builtins.c b/clang/test/CIR/CodeGenBuiltins/X86/avx512bw-builtins.c
similarity index 100%
rename from clang/test/CIR/CodeGen/X86/avx512bw-builtins.c
rename to clang/test/CIR/CodeGenBuiltins/X86/avx512bw-builtins.c
diff --git a/clang/test/CIR/CodeGen/X86/avx512f-builtins.c b/clang/test/CIR/CodeGenBuiltins/X86/avx512f-builtins.c
similarity index 100%
rename from clang/test/CIR/CodeGen/X86/avx512f-builtins.c
rename to clang/test/CIR/CodeGenBuiltins/X86/avx512f-builtins.c
diff --git a/clang/test/CIR/CodeGen/X86/avx512fp16-builtins.c b/clang/test/CIR/CodeGenBuiltins/X86/avx512fp16-builtins.c
similarity index 100%
rename from clang/test/CIR/CodeGen/X86/avx512fp16-builtins.c
rename to clang/test/CIR/CodeGenBuiltins/X86/avx512fp16-builtins.c
diff --git a/clang/test/CIR/CodeGen/X86/bmi-builtins.c b/clang/test/CIR/CodeGenBuiltins/X86/bmi-builtins.c
similarity index 100%
rename from clang/test/CIR/CodeGen/X86/bmi-builtins.c
rename to clang/test/CIR/CodeGenBuiltins/X86/bmi-builtins.c
diff --git a/clang/test/CIR/CodeGen/X86/lzcnt-builtins.c b/clang/test/CIR/CodeGenBuiltins/X86/lzcnt-builtins.c
similarity index 100%
rename from clang/test/CIR/CodeGen/X86/lzcnt-builtins.c
rename to clang/test/CIR/CodeGenBuiltins/X86/lzcnt-builtins.c
diff --git a/clang/test/CIR/CodeGen/X86/sse-builtins.c b/clang/test/CIR/CodeGenBuiltins/X86/sse-builtins.c
similarity index 100%
rename from clang/test/CIR/CodeGen/X86/sse-builtins.c
rename to clang/test/CIR/CodeGenBuiltins/X86/sse-builtins.c
diff --git a/clang/test/CIR/CodeGen/X86/sse2-builtins.c b/clang/test/CIR/CodeGenBuiltins/X86/sse2-builtins.c
similarity index 100%
rename from clang/test/CIR/CodeGen/X86/sse2-builtins.c
rename to clang/test/CIR/CodeGenBuiltins/X86/sse2-builtins.c
diff --git a/clang/test/CIR/CodeGen/builtin-fcmp-sse.c b/clang/test/CIR/CodeGenBuiltins/builtin-fcmp-sse.c
similarity index 100%
rename from clang/test/CIR/CodeGen/builtin-fcmp-sse.c
rename to clang/test/CIR/CodeGenBuiltins/builtin-fcmp-sse.c
diff --git a/clang/test/CIR/CodeGen/builtin-isfpclass.c b/clang/test/CIR/CodeGenBuiltins/builtin-isfpclass.c
similarity index 100%
rename from clang/test/CIR/CodeGen/builtin-isfpclass.c
rename to clang/test/CIR/CodeGenBuiltins/builtin-isfpclass.c
diff --git a/clang/test/CIR/CodeGen/builtin_bit.cpp b/clang/test/CIR/CodeGenBuiltins/builtin_bit.cpp
similarity index 100%
rename from clang/test/CIR/CodeGen/builtin_bit.cpp
rename to clang/test/CIR/CodeGenBuiltins/builtin_bit.cpp
diff --git a/clang/test/CIR/CodeGen/builtin_call.cpp b/clang/test/CIR/CodeGenBuiltins/builtin_call.cpp
similarity index 100%
rename from clang/test/CIR/CodeGen/builtin_call.cpp
rename to clang/test/CIR/CodeGenBuiltins/builtin_call.cpp
diff --git a/clang/test/CIR/CodeGen/builtin_inline.c b/clang/test/CIR/CodeGenBuiltins/builtin_inline.c
similarity index 100%
rename from clang/test/CIR/CodeGen/builtin_inline.c
rename to clang/test/CIR/CodeGenBuiltins/builtin_inline.c
diff --git a/clang/test/CIR/CodeGen/builtin_new_delete.cpp b/clang/test/CIR/CodeGenBuiltins/builtin_new_delete.cpp
similarity index 100%
rename from clang/test/CIR/CodeGen/builtin_new_delete.cpp
rename to clang/test/CIR/CodeGenBuiltins/builtin_new_delete.cpp
diff --git a/clang/test/CIR/CodeGen/builtin_prefetch.c b/clang/test/CIR/CodeGenBuiltins/builtin_prefetch.c
similarity index 100%
rename from clang/test/CIR/CodeGen/builtin_prefetch.c
rename to clang/test/CIR/CodeGenBuiltins/builtin_prefetch.c
diff --git a/clang/test/CIR/CodeGen/builtin_printf.cpp b/clang/test/CIR/CodeGenBuiltins/builtin_printf.cpp
similarity index 100%
rename from clang/test/CIR/CodeGen/builtin_printf.cpp
rename to clang/test/CIR/CodeGenBuiltins/builtin_printf.cpp
diff --git a/clang/test/CIR/CodeGen/builtins-elementwise.c b/clang/test/CIR/CodeGenBuiltins/builtins-elementwise.c
similarity index 100%
rename from clang/test/CIR/CodeGen/builtins-elementwise.c
rename to clang/test/CIR/CodeGenBuiltins/builtins-elementwise.c
diff --git a/clang/test/CIR/CodeGen/builtins-floating-point.c b/clang/test/CIR/CodeGenBuiltins/builtins-floating-point.c
similarity index 100%
rename from clang/test/CIR/CodeGen/builtins-floating-point.c
rename to clang/test/CIR/CodeGenBuiltins/builtins-floating-point.c
diff --git a/clang/test/CIR/CodeGen/builtins-overflow.cpp b/clang/test/CIR/CodeGenBuiltins/builtins-overflow.cpp
similarity index 100%
rename from clang/test/CIR/CodeGen/builtins-overflow.cpp
rename to clang/test/CIR/CodeGenBuiltins/builtins-overflow.cpp
diff --git a/clang/test/CIR/CodeGen/builtins.cpp b/clang/test/CIR/CodeGenBuiltins/builtins.cpp
similarity index 100%
rename from clang/test/CIR/CodeGen/builtins.cpp
rename to clang/test/CIR/CodeGenBuiltins/builtins.cpp