diff --git a/lib/Headers/avx512bf16intrin.h b/clang/lib/Headers/avx512bf16intrin.h
similarity index 100%
rename from lib/Headers/avx512bf16intrin.h
rename to clang/lib/Headers/avx512bf16intrin.h
diff --git a/lib/Headers/avx512vlbf16intrin.h b/clang/lib/Headers/avx512vlbf16intrin.h
similarity index 100%
rename from lib/Headers/avx512vlbf16intrin.h
rename to clang/lib/Headers/avx512vlbf16intrin.h
diff --git a/test/CodeGen/avx512bf16-builtins.c b/clang/test/CodeGen/avx512bf16-builtins.c
similarity index 100%
rename from test/CodeGen/avx512bf16-builtins.c
rename to clang/test/CodeGen/avx512bf16-builtins.c
diff --git a/test/CodeGen/avx512vlbf16-builtins.c b/clang/test/CodeGen/avx512vlbf16-builtins.c
similarity index 100%
rename from test/CodeGen/avx512vlbf16-builtins.c
rename to clang/test/CodeGen/avx512vlbf16-builtins.c
diff --git a/test/CodeGen/X86/avx512bf16-intrinsics.ll b/llvm/test/CodeGen/avx512bf16-intrinsics.ll
similarity index 100%
rename from test/CodeGen/X86/avx512bf16-intrinsics.ll
rename to llvm/test/CodeGen/avx512bf16-intrinsics.ll
diff --git a/test/CodeGen/X86/avx512bf16-vl-intrinsics.ll b/llvm/test/CodeGen/avx512bf16-vl-intrinsics.ll
similarity index 100%
rename from test/CodeGen/X86/avx512bf16-vl-intrinsics.ll
rename to llvm/test/CodeGen/avx512bf16-vl-intrinsics.ll
diff --git a/test/MC/Disassembler/X86/avx512bf16-att.txt b/llvm/test/MC/Disassembler/X86/avx512bf16-att.txt
similarity index 100%
rename from test/MC/Disassembler/X86/avx512bf16-att.txt
rename to llvm/test/MC/Disassembler/X86/avx512bf16-att.txt
diff --git a/test/MC/Disassembler/X86/avx512bf16-intel.txt b/llvm/test/MC/Disassembler/X86/avx512bf16-intel.txt
similarity index 100%
rename from test/MC/Disassembler/X86/avx512bf16-intel.txt
rename to llvm/test/MC/Disassembler/X86/avx512bf16-intel.txt
diff --git a/test/MC/Disassembler/X86/avx512bf16vl-att.txt b/llvm/test/MC/Disassembler/X86/avx512bf16vl-att.txt
similarity index 100%
rename from test/MC/Disassembler/X86/avx512bf16vl-att.txt
rename to llvm/test/MC/Disassembler/X86/avx512bf16vl-att.txt
diff --git a/test/MC/Disassembler/X86/avx512bf16vl-intel.txt b/llvm/test/MC/Disassembler/X86/avx512bf16vl-intel.txt
similarity index 100%
rename from test/MC/Disassembler/X86/avx512bf16vl-intel.txt
rename to llvm/test/MC/Disassembler/X86/avx512bf16vl-intel.txt
diff --git a/test/MC/Disassembler/X86/x86-64-avx512bf16-att.txt b/llvm/test/MC/Disassembler/X86/x86-64-avx512bf16-att.txt
similarity index 100%
rename from test/MC/Disassembler/X86/x86-64-avx512bf16-att.txt
rename to llvm/test/MC/Disassembler/X86/x86-64-avx512bf16-att.txt
diff --git a/test/MC/Disassembler/X86/x86-64-avx512bf16-intel.txt b/llvm/test/MC/Disassembler/X86/x86-64-avx512bf16-intel.txt
similarity index 100%
rename from test/MC/Disassembler/X86/x86-64-avx512bf16-intel.txt
rename to llvm/test/MC/Disassembler/X86/x86-64-avx512bf16-intel.txt
diff --git a/test/MC/Disassembler/X86/x86-64-avx512bf16vl-att.txt b/llvm/test/MC/Disassembler/X86/x86-64-avx512bf16vl-att.txt
similarity index 100%
rename from test/MC/Disassembler/X86/x86-64-avx512bf16vl-att.txt
rename to llvm/test/MC/Disassembler/X86/x86-64-avx512bf16vl-att.txt
diff --git a/test/MC/Disassembler/X86/x86-64-avx512bf16vl-intel.txt b/llvm/test/MC/Disassembler/X86/x86-64-avx512bf16vl-intel.txt
similarity index 100%
rename from test/MC/Disassembler/X86/x86-64-avx512bf16vl-intel.txt
rename to llvm/test/MC/Disassembler/X86/x86-64-avx512bf16vl-intel.txt
diff --git a/test/MC/X86/avx512_bf16-encoding.s b/llvm/test/MC/X86/avx512_bf16-encoding.s
similarity index 100%
rename from test/MC/X86/avx512_bf16-encoding.s
rename to llvm/test/MC/X86/avx512_bf16-encoding.s
diff --git a/test/MC/X86/avx512_bf16_vl-encoding.s b/llvm/test/MC/X86/avx512_bf16_vl-encoding.s
similarity index 100%
rename from test/MC/X86/avx512_bf16_vl-encoding.s
rename to llvm/test/MC/X86/avx512_bf16_vl-encoding.s
diff --git a/test/MC/X86/intel-syntax-avx512_bf16.s b/llvm/test/MC/X86/intel-syntax-avx512_bf16.s
similarity index 100%
rename from test/MC/X86/intel-syntax-avx512_bf16.s
rename to llvm/test/MC/X86/intel-syntax-avx512_bf16.s
diff --git a/test/MC/X86/intel-syntax-avx512_bf16_vl.s b/llvm/test/MC/X86/intel-syntax-avx512_bf16_vl.s
similarity index 100%
rename from test/MC/X86/intel-syntax-avx512_bf16_vl.s
rename to llvm/test/MC/X86/intel-syntax-avx512_bf16_vl.s
diff --git a/test/MC/X86/intel-syntax-x86-64-avx512_bf16.s b/llvm/test/MC/X86/intel-syntax-x86-64-avx512_bf16.s
similarity index 100%
rename from test/MC/X86/intel-syntax-x86-64-avx512_bf16.s
rename to llvm/test/MC/X86/intel-syntax-x86-64-avx512_bf16.s
diff --git a/test/MC/X86/intel-syntax-x86-64-avx512_bf16_vl.s b/llvm/test/MC/X86/intel-syntax-x86-64-avx512_bf16_vl.s
similarity index 100%
rename from test/MC/X86/intel-syntax-x86-64-avx512_bf16_vl.s
rename to llvm/test/MC/X86/intel-syntax-x86-64-avx512_bf16_vl.s
diff --git a/test/MC/X86/x86-64-avx512_bf16-encoding.s b/llvm/test/MC/X86/x86-64-avx512_bf16-encoding.s
similarity index 100%
rename from test/MC/X86/x86-64-avx512_bf16-encoding.s
rename to llvm/test/MC/X86/x86-64-avx512_bf16-encoding.s
diff --git a/test/MC/X86/x86-64-avx512_bf16_vl-encoding.s b/llvm/test/MC/X86/x86-64-avx512_bf16_vl-encoding.s
similarity index 100%
rename from test/MC/X86/x86-64-avx512_bf16_vl-encoding.s
rename to llvm/test/MC/X86/x86-64-avx512_bf16_vl-encoding.s