[clang] Adding Platform/Architecture Specific Resource Header Installation Targets

[qiongsiwu1]

Summary

The goal of this patch is to improve distribution build's flexibility to include only applicable header files.

Currently, the clang-resource-headers target contains nearly all the files in clang/lib/Headers. Most of these files are platform specific (e.g. immintrin.h is x86 specific). A distribution build will have to either include all the headers for all the platforms, or not include any headers. For example, if a distribution build for powerpc includes the clang-resource-headers target, it will include all the x86 specific headers, even-though the x86 specific headers cannot be used.

This patch breaks up the clang-resource-headers list to a core list and platform specific lists. With the patch, a distribution build can now include the ppc-resource-headers to include the headers applicable to the powerpc platform.

Specifically, one can now have

cmake ... LLVM_DISTRIBUTION_COMPONENTS="clang;ppc-resource-headers" ... ../llvm

ninja install-distribution then installs the powerpc headers.

Similarly, one can do

cmake ... LLVM_DISTRIBUTION_COMPONENTS="clang;x86-resource-headers" ... ../llvm

to include headers applicable to the x86 platform in a distribution installation.

To implement this behaviour, the patch does two things

1. It breaks up the long files header file list to a core list and platform specific lists.
2. It adds numerous platform specific installation targets.

This may or may not be a good way to break up the long header list to add new targets, so I am all ears for suggestions/feedback! Also, we may need to add other reviewers. May I get some suggestions on that as well?

Thanks so much!

[jsji]

@qiongsiwu1 Please also add reviewers from other targets. Thanks.

[tlively]

No concerns about the WebAssembly changes. Will the default installation for folks who don't touch LLVM_DISTRIBUTION_COMPONENTS change?

[qiongsiwu1]

In D123498#3443108, @tlively wrote:

No concerns about the WebAssembly changes. Will the default installation for folks who don't touch LLVM_DISTRIBUTION_COMPONENTS change?

Thanks Thomas! No, the default installations that use clang-resource-headers (e.g. here) do not change. This PR adds new targets without changing the contents of the existing clang-resource-headers target.

Edit: Sorry I misread the question. No, the default installations that do not use LLVM_DISTRIBUTION_COMPONENTS do not change either.

[abhina.sreeskantharajan]

this LGTM from a systemz perspective! thanks for refactoring

clang/lib/Headers/CMakeLists.txt

181

nit: There are some x86 headers here that appear to be x86 only. Should these be moved to x86_files list?

[qiongsiwu1]

May I get some comments from the rest of the reviewers for the respective platforms?
@momchil.velikov @chill: arm
@pengfei : x86
@jdoerfert: cuda
@yaxunl : opencl
@kaz7 : ve
@bcain : hexagon
@sdardis : mips

Thanks so much!

clang/lib/Headers/CMakeLists.txt

181

Thanks for the comment! Yes indeed. I think currently the x86gprintrin.h header is in the x86_files list (list starts at line 88). Did I miss some other x86 files?

[yaxunl]

Pls add @Anastasia for OpenCL.

LGTM for HIP. HIP headers depend on some of CUDA headers, but LGTM.

[chill]

Should these lists contain only source tree headers or also generated header files? I'm not seeing arm_mve.h, for example.

[DavidSpickett]

Is there any reason to have an AArch64 specific section? A lot of the files do apply to both Arm and AArch64 but for example the mve file Momchil mentioned does not.

Would make sense if you wanted AArch64 only there'd be an aarch64-resource-headers, even if it just makes the config command clearer. (I would expect some overlap in the file list though)

[DavidSpickett]

Then again a lot of Arm systems can run 32 bit code as well so there is a situation where you might include both.

[pengfei]

LGTM for X86.

clang/lib/Headers/CMakeLists.txt

95

Verified the list is correct to X86. Nit: should make them in alphabetical order?

202

Is it only used by X86 for now?

[abhina.sreeskantharajan]

clang/lib/Headers/CMakeLists.txt

181

Ah sorry, you're right, I think I read the list wrong. Thanks!

[qiongsiwu1]

Addressing review comments:

1. @chill pointed out that the generated headers are missing. The generated headers are added now.
2. @pengfei pointed out that some x86 headers are listed out of order. The list is sorted now.
3. @pengfei also commented on mm_malloc.h. I think it is needed for x86 and ppc. The header is added to these two targets.

@abdulras @compnerd May I get your comments on the riscv target?

Thank you all!

[qiongsiwu1]

In D123498#3448554, @DavidSpickett wrote:

Is there any reason to have an AArch64 specific section? A lot of the files do apply to both Arm and AArch64 but for example the mve file Momchil mentioned does not.

Would make sense if you wanted AArch64 only there'd be an aarch64-resource-headers, even if it just makes the config command clearer. (I would expect some overlap in the file list though)

Sure, we can have an AArch64 specific section. I have no AArch64/arm background to comment on what the lists should look like. Could you provide a pointer on how to decide what should be AArch64 specific? Thank you!

[DavidSpickett]

Sure, we can have an AArch64 specific section. I have no AArch64/arm background to comment on what the lists should look like. Could you provide a pointer on how to decide what should be AArch64 specific? Thank you!

I looked through the list and here's what goes where:

arm_acle.h - both
arm_cmse.h - Arm only (CMSE is an M profile feature)
armintr.h - Arm only (Windows intrinsics)
arm64intr.h - AArch64 only (Windows intrinsics)

arm_neon.h - both
arm_fp16.h - both

Only includes AArch64 stuff at this time but according to the docs:

FEAT_FP16 supports:
• Half-precision data-processing instructions for Advanced SIMD and floating-point in both
AArch64 and AArch32 states.

arm_sve.h - AArch64 (SVE is AArch64 exclusive)
arm_bf16.h - AArch64 only

"FEAT_BF16 supports the BFloat16, or BF16, 16-bit floating-point storage format in AArch64 state."

arm_mve.h - Arm only (MVE is an M profile feature)
arm_cde.h - Arm only (CDE is an M profile feature)
arm_neon_sve_bridge.h - AArch64 only (SVE is AArch64 exclusive)

@momchil.velikov Please double check I got that right.

So you'd probably want to have an arm_common, like you have for the core. Arm installs arm_common and arm, AArch64 installs arm_common and aarch64.

Not sure if you'd expect the Windows intrisics files to show up in the windows headers. My guess is no because you'd configure with Windows and Arm, or Windows and AArch64 headers. windows would just be arch agnostic stuff.

This split reduces each install by 4 headers. So hardly amazing disk space wise but I think your goal is more to only have relevant files and this achieves that.

Then again a lot of Arm systems can run 32 bit code as well so there is a situation where you might include both.

I would guess that having two install targets makes it obvious that if you want 32 bit code you need to opt into both. (though I am biased since I'm already familiar with Arm)

Also, what's the feedback mechanism for issues with these listings? Say we add a new Arm header but forget to put it on these lists, who would be the first to notice? (I admit I'm not very familiar with the process of distributions)

[qiongsiwu1]

Thanks @DavidSpickett !! The patch is updated. The arm headers are now split between arm and aarch64.

Also, what's the feedback mechanism for issues with these listings? Say we add a new Arm header but forget to put it on these lists, who would be the first to notice? (I admit I'm not very familiar with the process of distributions)

This is a good question. I don't think there are automatic tests against distribution installations. So in the worst case it could be the user of a distribution to first notice that a header is missing. Let me look into the possibilities to automatically check for the case if a header exists, but is not added to any of the target specific headers.

At the moment, adding new arm specific headers to arm_common_files, arm_only_files or aarch64_only_files lists will make sure they are included in the distribution targets. The generated ones are more problematic and may be missed.

[qiongsiwu1]

Also, what's the feedback mechanism for issues with these listings? Say we add a new Arm header but forget to put it on these lists, who would be the first to notice? (I admit I'm not very familiar with the process of distributions)

Ok so I reworked the logic to add the generated headers and added a check. If there is a header generated, but not added to a target specific list, we have a cmake warning during configuration. The reason that I did not make it into a fatal error is that the omission does not affect building and testing clang/llvm, and it only affects a target specific distribution target. I can revise it to a fatal error if that is more desired.

Thanks again @DavidSpickett for the feedback! @chill may I get some comments from you as well? Thank you!

[qiongsiwu1]

@DavidSpickett @chill @momchil.velikov May I get some comments on the arm/aarch64 related code changes? Thank you!

[DavidSpickett]

The Arm/AArch64 split and the generated files check looks good to me.

Unless I'm missing an existing check, is it possible to check for the existing files too? I guess not nicely because along with the resource headers there are lots of internal headers, so we'd have to maintain some list of "non resource" headers which means we've just created another thing to maintain.

[qiongsiwu1]

In D123498#3458357, @DavidSpickett wrote:

Unless I'm missing an existing check, is it possible to check for the existing files too? I guess not nicely because along with the resource headers there are lots of internal headers, so we'd have to maintain some list of "non resource" headers which means we've just created another thing to maintain.

This is a good point. Having such checks will be beneficial, but I concur that it is not easy to check for all the existing files given what we have now (the current way headers are organized etc) and I agree that we may end up maintaining more lists. Therefore I am keeping this patch in its current shape at this stage. I can come back and revisit once I find a clean way to check for the necessity of the header file. Maybe I can ask cmake to check for architecture/targets during configuration and select the headers automatically, but that is beyond the scope of this patch.

[DavidSpickett]

Therefore I am keeping this patch in its current shape at this stage.

Sounds good to me.

[pengfei]

Maybe I can ask cmake to check for architecture/targets during configuration and select the headers automatically, but that is beyond the scope of this patch.

I'm not familar with cmake, but I guess it might be doable. I once verified the X86 headers by command echo '#include <x86intrin.h>' | clang -x c -E - | grep '#.*clang.*h' | grep -o '[^\/]*\.h' |sort|uniq.
Notice, targets like X86 doesn't have a single entry. But it still available with a bit more work.

[qiongsiwu1]

In D123498#3458967, @pengfei wrote:

Maybe I can ask cmake to check for architecture/targets during configuration and select the headers automatically, but that is beyond the scope of this patch.

I'm not familar with cmake, but I guess it might be doable. I once verified the X86 headers by command echo '#include <x86intrin.h>' | clang -x c -E - | grep '#.*clang.*h' | grep -o '[^\/]*\.h' |sort|uniq.
Notice, targets like X86 doesn't have a single entry. But it still available with a bit more work.

Ah I see! Let me look into adopting something along this line. Maybe eventually we can remove all the lists (or reduce the lists to minimal) here.

Thanks for the input!

[rastogishubham]

Hi, this patch causes an issue with the CMake Xcode build configuration, if I try to use xcode as the generator with CMake, using the build command:

xcrun cmake -G Xcode -DCMAKE_BUILD_TYPE:STRING=Debug -DLLVM_ENABLE_ASSERTIONS:BOOL=TRUE -DCMAKE_C_COMPILER=/usr/bin/clang -DCMAKE_CXX_COMPILER=/usr/bin/clang++ -DLLVM_ENABLE_PROJECTS='clang;' -DCMAKE_IGNORE_PATH="/usr/lib;/usr/local/lib;/lib" -DLLVM_TARGETS_TO_BUILD="X86;ARM;AArch64" ../llvm

I get:

CMake Error in /Users/shubhamrastogi/Development/llvm-project-cas/llvm-project/clang/lib/Headers/CMakeLists.txt:

The custom command generating

  /Users/shubhamrastogi/Development/llvm-project-cas/llvm-project/build/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/lib/clang/15.0.0/include/float.h

is attached to multiple targets:

  x86-resource-headers
  windows-resource-headers
  webassembly-resource-headers
  systemz-resource-headers
  mips-resource-headers
  arm-resource-headers
  cuda-resource-headers
  riscv-resource-headers
  ppc-resource-headers
  opencl-resource-headers
  aarch64-resource-headers
  hip-resource-headers
  ve-resource-headers
  hexagon-resource-headers
  clang-resource-headers

but none of these is a common dependency of the other(s).  This is not
allowed by the Xcode "new build system".

CMake Error in /Users/shubhamrastogi/Development/llvm-project-cas/llvm-project/third-party/benchmark/CMakeLists.txt:

The custom command generating

  /Users/shubhamrastogi/Development/llvm-project-cas/llvm-project/build/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/lib/clang/15.0.0/include/float.h

is attached to multiple targets:

  x86-resource-headers
  windows-resource-headers
  webassembly-resource-headers
  systemz-resource-headers
  mips-resource-headers
  arm-resource-headers
  cuda-resource-headers
  riscv-resource-headers
  ppc-resource-headers
  opencl-resource-headers
  aarch64-resource-headers
  hip-resource-headers
  ve-resource-headers
  hexagon-resource-headers
  clang-resource-headers

but none of these is a common dependency of the other(s).  This is not
allowed by the Xcode "new build system".

I used git bisect to figure this out, is there some solution to this?

[qiongsiwu1]

In D123498#3465139, @rastogishubham wrote:

Hi, this patch causes an issue with the CMake Xcode build configuration, if I try to use xcode as the generator with CMake, using the build command:

I used git bisect to figure this out, is there some solution to this?

Hi Schubham!

I will go take a look to see how we can provide a long term solution. In the meantime, could you try the workaround here https://stackoverflow.com/questions/65473503/when-trying-to-generate-an-xcode-project-from-a-cmake-folder-i-get-an-error-rel?

Thanks!

[rastogishubham]

Hi Qiongsi

Thanks for the response!

[ye-luo]

Got some trouble. See https://github.com/llvm/llvm-project/issues/55002

[Anastasia]

clang/lib/Headers/CMakeLists.txt

394

I feel that the above comment doesn't apply here:
# Architecture/platform specific targets

This header is not a target or platform specific so I don't imagine it can ever be optional unless we start modularization of the language support in clang parsing.

[qiongsiwu1]

This patch is updated to address

• https://github.com/llvm/llvm-project/issues/55002 @ye-luo Specifically, we now correctly exclude the new targets from default builds to avoid duplicating headers.
• configuration issue with xcode @rastogishubham
• regrouping of header targets so the comments apply. @Anastasia

@ye-luo @rastogishubham if you get a chance, could you try the patch and see if it works? Thanks!

Thanks for the comments and the issue reports!

[ye-luo]

@qiongsiwu1 Tested the updated patch. Works fine now.

[rastogishubham]

Hi Qiongsi,

Thank you for your work on the patch, it seems to work now!

Shubham

[craig.topper]

clang/lib/Headers/CMakeLists.txt

421

There appear to be two installs of ppc_wrapper_files with different components. Is that intentional?

[qiongsiwu1]

clang/lib/Headers/CMakeLists.txt

421

Ah yes this is indeed intentional. cuda_wrapper_files and openmp_wrapper_files have two install targets as well. The first target is part of the "catch-all" clang-resource-headers. The second targets are not installed by default (EXCLUDE_FROM_ALL). and a distribution build can opt-in the relevant set of headers.

That said, if there are better ways to implement the logic I am all ears.

[craig.topper]

clang/lib/Headers/CMakeLists.txt

421

As far as I know, the ppc_wrapper_files are only usable on the powerpc target so I don't think they should be treated any different than ppc_files. ppc_files only has one install target right?

[qiongsiwu1]

clang/lib/Headers/CMakeLists.txt

421

As far as I know, the ppc_wrapper_files are only usable on the powerpc target

Yes that is my understanding as well.

ppc_files only has one install target right?

There is indeed one install target specifically setup to include only ppc files. Meanwhile, the ppc files are also included in the ${files} list (which is installed as as a component of the catch-all clang-resource-headers), so the ppc files are included in two different install targets.

[craig.topper]

clang/lib/Headers/CMakeLists.txt

421

Thanks. I was trying to resolve some merge issues in my downstream and I really should have read your changes more closely.

548

Should this be windows_only_files. I don't see a windows_files defined anywhere.

[craig.topper]

clang/lib/Headers/CMakeLists.txt

537

Should this be ${header_install_dir}/openmp_wrappers

[qiongsiwu1]

clang/lib/Headers/CMakeLists.txt

421

No problem!

537

Oh good catch! Thanks! I am fixing this in https://reviews.llvm.org/D126002, together with the issue with windows only headers.

clang/lib/Headers/CMakeLists.txt

-set(files
-  adxintrin.h
-  altivec.h
-  ammintrin.h
-  amxintrin.h
+# core_files list contains the headers shared by all platforms.
+# Please consider adding new platform specific headers
+# to platform specific lists below.
+set(core_files
+  builtins.h
+  float.h
+  inttypes.h
+  iso646.h
+  limits.h
+  module.modulemap
+  stdalign.h
+  stdarg.h
+  stdatomic.h
+  stdbool.h
+  stddef.h
+  __stddef_max_align_t.h
+  stdint.h
+  stdnoreturn.h
+  tgmath.h
+  unwind.h
+  varargs.h
+  )
+
+set(arm_common_files
+  # Headers shared by Arm and AArch64
   arm_acle.h
+  )
+
+set(arm_only_files
   arm_cmse.h
   armintr.h
+  )
+
+set(aarch64_only_files
   arm64intr.h
+  )
+
+set(cuda_files
+  __clang_cuda_builtin_vars.h
+  __clang_cuda_math.h
+  __clang_cuda_cmath.h
+  __clang_cuda_complex_builtins.h
+  __clang_cuda_device_functions.h
+  __clang_cuda_intrinsics.h
+  __clang_cuda_texture_intrinsics.h
+  __clang_cuda_libdevice_declares.h
+  __clang_cuda_math_forward_declares.h
+  __clang_cuda_runtime_wrapper.h
+  )
+
+set(hexagon_files
+  hexagon_circ_brev_intrinsics.h
+  hexagon_protos.h
+  hexagon_types.h
+  hvx_hexagon_protos.h
+  )
+
+set(hip_files
+  __clang_hip_libdevice_declares.h
+  __clang_hip_cmath.h
+  __clang_hip_math.h
+  __clang_hip_runtime_wrapper.h
+  )
+
+set(mips_msa_files
+  msa.h
+  )
+
+set(opencl_files
+  opencl-c.h
+  opencl-c-base.h
+  )
+
+set(ppc_files
+  altivec.h
+  htmintrin.h
+  htmxlintrin.h
+  )
+
+set(systemz_files
+  s390intrin.h
+  vecintrin.h
+  )
+
+set(ve_files
+  velintrin.h
+  velintrin_gen.h
+  velintrin_approx.h
+  )
+
+set(webassembly_files
+  wasm_simd128.h
+  )
+
+set(x86_files
+# Intrinsics
+  adxintrin.h
+  ammintrin.h
+  amxintrin.h
   avx2intrin.h
   avx512bf16intrin.h
-  avx512bwintrin.h
   avx512bitalgintrin.h
-  avx512vlbitalgintrin.h
+  avx512bwintrin.h
   avx512cdintrin.h
-  avx512vpopcntdqintrin.h
   avx512dqintrin.h
   avx512erintrin.h
   avx512fintrin.h
   avx512fp16intrin.h
   avx512ifmaintrin.h
   avx512ifmavlintrin.h
   avx512pfintrin.h
+  avx512vbmi2intrin.h
   avx512vbmiintrin.h
   avx512vbmivlintrin.h
-  avx512vbmi2intrin.h
-  avx512vlvbmi2intrin.h
   avx512vlbf16intrin.h
+  avx512vlbitalgintrin.h
   avx512vlbwintrin.h
   avx512vlcdintrin.h
   avx512vldqintrin.h
   avx512vlfp16intrin.h
   avx512vlintrin.h
-  avx512vp2intersectintrin.h
+  avx512vlvbmi2intrin.h
+  avx512vlvnniintrin.h
   avx512vlvp2intersectintrin.h
-  avx512vpopcntdqvlintrin.h
   avx512vnniintrin.h
-  avx512vlvnniintrin.h
+  avx512vp2intersectintrin.h
+  avx512vpopcntdqintrin.h
+  avx512vpopcntdqvlintrin.h
   avxintrin.h
   avxvnniintrin.h
   bmi2intrin.h
   bmiintrin.h
-  builtins.h
-  __clang_cuda_builtin_vars.h
-  __clang_cuda_math.h
-  __clang_cuda_cmath.h
-  __clang_cuda_complex_builtins.h
-  __clang_cuda_device_functions.h
-  __clang_cuda_intrinsics.h
-  __clang_cuda_texture_intrinsics.h
-  __clang_cuda_libdevice_declares.h
-  __clang_cuda_math_forward_declares.h
-  __clang_cuda_runtime_wrapper.h
-  __clang_hip_libdevice_declares.h
-  __clang_hip_cmath.h
-  __clang_hip_math.h
-  __clang_hip_runtime_wrapper.h
   cetintrin.h
-  cet.h
   cldemoteintrin.h
-  clzerointrin.h
-  crc32intrin.h
-  cpuid.h
   clflushoptintrin.h
   clwbintrin.h
+  clzerointrin.h
+  crc32intrin.h
   emmintrin.h
   enqcmdintrin.h
   f16cintrin.h
-  float.h
   fma4intrin.h
   fmaintrin.h
   fxsrintrin.h
   gfniintrin.h
-  hexagon_circ_brev_intrinsics.h
-  hexagon_protos.h
-  hexagon_types.h
-  hvx_hexagon_protos.h
   hresetintrin.h
-  htmintrin.h
-  htmxlintrin.h
   ia32intrin.h
   immintrin.h
-  intrin.h
-  inttypes.h
   invpcidintrin.h
-  iso646.h
   keylockerintrin.h
-  limits.h
   lwpintrin.h
   lzcntintrin.h
   mm3dnow.h
   mmintrin.h
-  mm_malloc.h
-  module.modulemap
   movdirintrin.h
-  msa.h
   mwaitxintrin.h
   nmmintrin.h
-  opencl-c.h
-  opencl-c-base.h
+  pconfigintrin.h
   pkuintrin.h
   pmmintrin.h
-  pconfigintrin.h
   popcntintrin.h
   prfchwintrin.h
   ptwriteintrin.h
   rdseedintrin.h
   rtmintrin.h
   serializeintrin.h
   sgxintrin.h
-  s390intrin.h
   shaintrin.h
   smmintrin.h
-  stdalign.h
-  stdarg.h
-  stdatomic.h
-  stdbool.h
-  stddef.h
-  __stddef_max_align_t.h
-  stdint.h
-  stdnoreturn.h
   tbmintrin.h
-  tgmath.h
   tmmintrin.h
   tsxldtrkintrin.h
   uintrintrin.h
-  unwind.h
-  vadefs.h
   vaesintrin.h
-  varargs.h
-  vecintrin.h
   vpclmulqdqintrin.h
   waitpkgintrin.h
-  wasm_simd128.h
   wbnoinvdintrin.h
-  wmmintrin.h
   __wmmintrin_aes.h
+  wmmintrin.h
   __wmmintrin_pclmul.h
   x86gprintrin.h
   x86intrin.h
   xmmintrin.h
   xopintrin.h
   xsavecintrin.h
   xsaveintrin.h
   xsaveoptintrin.h
   xsavesintrin.h
   xtestintrin.h
-  velintrin.h
-  velintrin_gen.h
-  velintrin_approx.h
+# others
+  cet.h
+  cpuid.h
+  )
+
+set(windows_only_files
+  intrin.h
+  vadefs.h
+)
+
+set(utility_files
+  mm_malloc.h
+)
+
+set(files
+  ${core_files}
+  ${arm_common_files}
+  ${arm_only_files}
+  ${aarch64_only_files}
+  ${cuda_files}
+  ${hexagon_files}
+  ${hip_files}
+  ${mips_msa_files}
+  ${opencl_files}
+  ${ppc_files}
+  ${systemz_files}
+  ${ve_files}
+  ${x86_files}
+  ${webassembly_files}
+  ${windows_only_files}
+  ${utility_files}
   )
 
 set(cuda_wrapper_files
   cuda_wrappers/algorithm
   cuda_wrappers/complex
   cuda_wrappers/new
 )
 
 set(ppc_wrapper_files
   ppc_wrappers/mmintrin.h
   ppc_wrappers/xmmintrin.h
   ppc_wrappers/mm_malloc.h
   ppc_wrappers/emmintrin.h
   ppc_wrappers/pmmintrin.h
   ppc_wrappers/tmmintrin.h
   ppc_wrappers/smmintrin.h
   ppc_wrappers/bmiintrin.h
   ppc_wrappers/bmi2intrin.h
   ppc_wrappers/immintrin.h
-  ppc_wrappers/tmmintrin.h
   ppc_wrappers/x86intrin.h
   ppc_wrappers/x86gprintrin.h
 )
 
 set(openmp_wrapper_files
   openmp_wrappers/math.h
   openmp_wrappers/cmath
   openmp_wrappers/complex.h
   openmp_wrappers/complex
   openmp_wrappers/__clang_openmp_device_functions.h
   openmp_wrappers/complex_cmath.h
   openmp_wrappers/new
 )
 
 set(output_dir ${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}/include)
 set(out_files)
 set(generated_files)
 
+set(arm_common_generated_files)
+set(arm_only_generated_files)
+set(aarch64_only_generated_files)
+set(riscv_generated_files)
+
 function(copy_header_to_output_dir src_dir file)
   set(src ${src_dir}/${file})
   set(dst ${output_dir}/${file})
   add_custom_command(OUTPUT ${dst}
     DEPENDS ${src}
     COMMAND ${CMAKE_COMMAND} -E copy_if_different ${src} ${dst}
     COMMENT "Copying clang's ${file}...")
   list(APPEND out_files ${dst})
if(ARM IN_LIST LLVM_TARGETS_TO_BUILD OR AArch64 IN_LIST LLVM_TARGETS_TO_BUILD)
   # Generate arm_mve.h
   clang_generate_header(-gen-arm-mve-header arm_mve.td arm_mve.h)
   # Generate arm_cde.h
   clang_generate_header(-gen-arm-cde-header arm_cde.td arm_cde.h)
   # Copy arm_neon_sve_bridge.h
   copy_header_to_output_dir(${CMAKE_CURRENT_SOURCE_DIR}
     arm_neon_sve_bridge.h
   )
+
+  # Add headers to target specific lists
+  list(APPEND arm_common_generated_files
+    "${CMAKE_CURRENT_BINARY_DIR}/arm_neon.h"
+    "${CMAKE_CURRENT_BINARY_DIR}/arm_fp16.h"
+    )
+
+  list(APPEND arm_only_generated_files
+    "${CMAKE_CURRENT_BINARY_DIR}/arm_mve.h"
+    "${CMAKE_CURRENT_BINARY_DIR}/arm_cde.h"
+    )
+
+  list(APPEND aarch64_only_generated_files
+    "${CMAKE_CURRENT_BINARY_DIR}/arm_sve.h"
+    "${CMAKE_CURRENT_BINARY_DIR}/arm_bf16.h"
+    "${output_dir}/arm_neon_sve_bridge.h"
+    )
 endif()
 if(RISCV IN_LIST LLVM_TARGETS_TO_BUILD)
   # Generate riscv_vector.h
   clang_generate_header(-gen-riscv-vector-header riscv_vector.td riscv_vector.h)
+  list(APPEND riscv_generated_files
+    "${CMAKE_CURRENT_BINARY_DIR}/riscv_vector.h"
+    )
 endif()
 
-add_custom_target(clang-resource-headers ALL DEPENDS ${out_files})
-set_target_properties(clang-resource-headers PROPERTIES
+
+# Check if the generated headers are included in a target specific lists
+# Currently, all generated headers are target specific.
+set(all_target_specific_generated_files
+  ${arm_common_generated_files}
+  ${arm_only_generated_files}
+  ${aarch64_only_generated_files}
+  ${riscv_generated_files})
+foreach( f ${generated_files} )
+  if (NOT ${f} IN_LIST all_target_specific_generated_files)
+    message(WARNING "${f} is a generated header but it is not included in any "
+                    "target specific header lists! The resource-headers "
+                    "distribtion target will be incorrect!")
+  endif()
+endforeach( f )
+
+function(add_header_target target_name file_list)
+  add_custom_target(${target_name} DEPENDS ${file_list})
+  set_target_properties(${target_name} PROPERTIES
     FOLDER "Misc"
     RUNTIME_OUTPUT_DIRECTORY "${output_dir}")
+endfunction()
+
+# The catch-all clang-resource-headers target
+add_custom_target("clang-resource-headers" ALL DEPENDS ${out_files})
+set_target_properties("clang-resource-headers" PROPERTIES
+  FOLDER "Misc"
+  RUNTIME_OUTPUT_DIRECTORY "${output_dir}")
+add_dependencies("clang-resource-headers"
+                 "core-resource-headers"
+                 "arm-common-headers"
+                 "arm-resource-headers"
+                 "aarch64-resource-headers"
+                 "cuda-resource-headers"
+                 "hexagon-resource-headers"
+                 "hip-resource-headers"
+                 "mips-resource-headers"
+                 "ppc-resource-headers"
+                 "riscv-resource-headers"
+                 "systemz-resource-headers"
+                 "ve-resource-headers"
+                 "webassembly-resource-headers"
+                 "x86-resource-headers"
+                 "opencl-resource-headers"
+                 "openmp-resource-headers"
+                 "windows-resource-headers"
+                 "utility-resource-headers")
+
+# Core/common headers
+add_header_target("core-resource-headers" ${core_files})
+add_header_target("arm-common-headers" "${arm_common_files};${arm_common_generated_files}")
+
+# Architecture/platform specific targets
+add_header_target("arm-resource-headers" "${arm_only_files};${arm_only_generated_files}")
+add_header_target("aarch64-resource-headers" "${aarch64_only_files};${aarch64_only_generated_files}")
+add_header_target("cuda-resource-headers" "${cuda_files};${cuda_wrapper_files}")
+add_header_target("hexagon-resource-headers" "${hexagon_files}")
+add_header_target("hip-resource-headers" "${hip_files}")
+add_header_target("mips-resource-headers" "${mips_msa_files}")
+add_header_target("ppc-resource-headers" "${ppc_files};${ppc_wrapper_files}")
+add_header_target("riscv-resource-headers" "${riscv_generated_files}")
+add_header_target("systemz-resource-headers" "${systemz_files}")
+add_header_target("ve-resource-headers" "${ve_files}")
+add_header_target("webassembly-resource-headers" "${webassembly_files}")
+add_header_target("x86-resource-headers" "${x86_files}")
+
+# Other header groupings
+add_header_target("opencl-resource-headers" ${opencl_files})
+add_header_target("openmp-resource-headers" ${openmp_wrapper_files})
+add_header_target("windows-resource-headers" ${windows_only_files})
+add_header_target("utility-resource-headers" ${utility_files})
 
 set(header_install_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include)
 
+#############################################################
+# Install rules for the catch-all clang-resource-headers target
 install(
   FILES ${files} ${generated_files}
   DESTINATION ${header_install_dir}
   COMPONENT clang-resource-headers)
 
 install(
   FILES ${cuda_wrapper_files}
   DESTINATION ${header_install_dir}/cuda_wrappers
   COMPONENT clang-resource-headers)
 
 install(
   FILES ${ppc_wrapper_files}
   DESTINATION ${header_install_dir}/ppc_wrappers
   COMPONENT clang-resource-headers)
 
 install(
   FILES ${openmp_wrapper_files}
   DESTINATION ${header_install_dir}/openmp_wrappers
   COMPONENT clang-resource-headers)
 
+#############################################################
+# Install rules for separate header lists
+install(
+  FILES ${core_files}
+  DESTINATION ${header_install_dir}
+  EXCLUDE_FROM_ALL
+  COMPONENT core-resource-headers)
+
+install(
+  FILES ${arm_common_files} ${arm_common_generated_files}
+  DESTINATION ${header_install_dir}
+  EXCLUDE_FROM_ALL
+  COMPONENT arm-common-resource-headers)
+
+install(
+  FILES ${arm_only_files} ${arm_only_generated_files}
+  DESTINATION ${header_install_dir}
+  EXCLUDE_FROM_ALL
+  COMPONENT arm-resource-headers)
+
+install(
+  FILES ${aarch64_only_files} ${aarch64_only_generated_files}
+  DESTINATION ${header_install_dir}
+  EXCLUDE_FROM_ALL
+  COMPONENT aarch64-resource-headers)
+
+install(
+  FILES ${cuda_wrapper_files}
+  DESTINATION ${header_install_dir}/cuda_wrappers
+  EXCLUDE_FROM_ALL
+  COMPONENT cuda-resource-headers)
+
+install(
+  FILES ${cuda_files}
+  DESTINATION ${header_install_dir}
+  EXCLUDE_FROM_ALL
+  COMPONENT cuda-resource-headers)
+
+install(
+  FILES ${hexagon_files}
+  DESTINATION ${header_install_dir}
+  EXCLUDE_FROM_ALL
+  COMPONENT hexagon-resource-headers)
+
+install(
+  FILES ${hip_files}
+  DESTINATION ${header_install_dir}
+  EXCLUDE_FROM_ALL
+  COMPONENT hip-resource-headers)
+
+install(
+  FILES ${mips_msa_files}
+  DESTINATION ${header_install_dir}
+  EXCLUDE_FROM_ALL
+  COMPONENT mips-resource-headers)
+
+install(
+  FILES ${ppc_wrapper_files}
+  DESTINATION ${header_install_dir}/ppc_wrappers
+  EXCLUDE_FROM_ALL
+  COMPONENT ppc-resource-headers)
+
+install(
+  FILES ${ppc_files} ${utility_files}
+  DESTINATION ${header_install_dir}
+  EXCLUDE_FROM_ALL
+  COMPONENT ppc-resource-headers)
+
+install(
+  FILES ${riscv_generated_files}
+  DESTINATION ${header_install_dir}
+  EXCLUDE_FROM_ALL
+  COMPONENT riscv-resource-headers)
+
+install(
+  FILES ${systemz_files}
+  DESTINATION ${header_install_dir}
+  EXCLUDE_FROM_ALL
+  COMPONENT systemz-resource-headers)
+
+install(
+  FILES ${ve_files}
+  DESTINATION ${header_install_dir}
+  EXCLUDE_FROM_ALL
+  COMPONENT ve-resource-headers)
+
+install(
+  FILES ${webassembly_files}
+  DESTINATION ${header_install_dir}
+  EXCLUDE_FROM_ALL
+  COMPONENT webassembly-resource-headers)
+
+install(
+  FILES ${x86_files}
+  DESTINATION ${header_install_dir}
+  EXCLUDE_FROM_ALL
+  COMPONENT x86-resource-headers)
+
+install(
+  FILES ${opencl_files}
+  DESTINATION ${header_install_dir}
+  EXCLUDE_FROM_ALL
+  COMPONENT opencl-resource-headers)
+
+install(
+  FILES ${openmp_wrapper_files}
+  DESTINATION ${header_install_dir}
+  EXCLUDE_FROM_ALL
+  COMPONENT openmp-resource-headers)
+
+install(
+  FILES ${utility_files}
+  DESTINATION ${header_install_dir}
+  EXCLUDE_FROM_ALL
+  COMPONENT utility-resource-headers)
+
+install(
+  FILES ${windows_files}
+  DESTINATION ${header_install_dir}
+  EXCLUDE_FROM_ALL
+  COMPONENT windows-resource-headers)
+#############################################################
+
 if (NOT LLVM_ENABLE_IDE)
   add_llvm_install_targets(install-clang-resource-headers
                            DEPENDS clang-resource-headers
                            COMPONENT clang-resource-headers)
+
+  add_llvm_install_targets(install-core-resource-headers
+                           DEPENDS core-resource-headers
+                           COMPONENT core-resource-headers)
+  add_llvm_install_targets(install-arm-common-resource-headers
+                           DEPENDS arm-common-resource-headers
+                           COMPONENT arm-common-resource-headers)
+  add_llvm_install_targets(install-arm-resource-headers
+                           DEPENDS arm-resource-headers
+                           COMPONENT arm-resource-headers)
+  add_llvm_install_targets(install-aarch64-resource-headers
+                           DEPENDS aarch64-resource-headers
+                           COMPONENT aarch64-resource-headers)
+  add_llvm_install_targets(install-cuda-resource-headers
+                           DEPENDS cuda-resource-headers
+                           COMPONENT cuda-resource-headers)
+  add_llvm_install_targets(install-hexagon-resource-headers
+                           DEPENDS hexagon-resource-headers
+                           COMPONENT hexagon-resource-headers)
+  add_llvm_install_targets(install-hip-resource-headers
+                           DEPENDS hip-resource-headers
+                           COMPONENT hip-resource-headers)
+  add_llvm_install_targets(install-mips-resource-headers
+                           DEPENDS mips-resource-headers
+                           COMPONENT mips-resource-headers)
+  add_llvm_install_targets(install-ppc-resource-headers
+                           DEPENDS ppc-resource-headers
+                           COMPONENT ppc-resource-headers)
+  add_llvm_install_targets(install-riscv-resource-headers
+                           DEPENDS riscv-resource-headers
+                           COMPONENT riscv-resource-headers)
+  add_llvm_install_targets(install-systemz-resource-headers
+                           DEPENDS systemz-resource-headers
+                           COMPONENT systemz-resource-headers)
+  add_llvm_install_targets(install-ve-resource-headers
+                           DEPENDS ve-resource-headers
+                           COMPONENT ve-resource-headers)
+  add_llvm_install_targets(install-x86-resource-headers
+                           DEPENDS x86-resource-headers
+                           COMPONENT x86-resource-headers)
+  add_llvm_install_targets(install-webassembly-resource-headers
+                           DEPENDS webassembly-resource-headers
+                           COMPONENT webassembly-resource-headers)
+
+  add_llvm_install_targets(install-opencl-resource-headers
+                           DEPENDS opencl-resource-headers
+                           COMPONENT opencl-resource-headers)
+  add_llvm_install_targets(install-openmp-resource-headers
+                           DEPENDS openmp-resource-headers
+                           COMPONENT openmp-resource-headers)
+  add_llvm_install_targets(install-windows-resource-headers
+                           DEPENDS window-resource-headers
+                           COMPONENT windows-resource-headers)
+  add_llvm_install_targets(install-utility-resource-headers
+                           DEPENDS utility-resource-headers
+                           COMPONENT utility-resource-headers)
 endif()