ashgti wrote: I'm working on splitting out the test changes, #140107 is the main set that I think are related. If so, this may become a more of a NFC from the test perspective. https://github.com/llvm/llvm-project/pull/139669