diff --git a/llvm/test/CodeGen/AMDGPU/aa-as-infer.ll b/llvm/test/Transforms/Attributor/AMDGPU/aa-as-infer.ll
similarity index 100%
rename from llvm/test/CodeGen/AMDGPU/aa-as-infer.ll
rename to llvm/test/Transforms/Attributor/AMDGPU/aa-as-infer.ll
diff --git a/llvm/test/CodeGen/AMDGPU/addrspacecast-constantexpr.ll b/llvm/test/Transforms/Attributor/AMDGPU/addrspacecast-constantexpr.ll
similarity index 100%
rename from llvm/test/CodeGen/AMDGPU/addrspacecast-constantexpr.ll
rename to llvm/test/Transforms/Attributor/AMDGPU/addrspacecast-constantexpr.ll
diff --git a/llvm/test/CodeGen/AMDGPU/amdgpu-attributor-no-agpr.ll b/llvm/test/Transforms/Attributor/AMDGPU/amdgpu-attributor-no-agpr.ll
similarity index 100%
rename from llvm/test/CodeGen/AMDGPU/amdgpu-attributor-no-agpr.ll
rename to llvm/test/Transforms/Attributor/AMDGPU/amdgpu-attributor-no-agpr.ll
diff --git a/llvm/test/CodeGen/AMDGPU/annotate-existing-abi-attributes.ll b/llvm/test/Transforms/Attributor/AMDGPU/annotate-existing-abi-attributes.ll
similarity index 100%
rename from llvm/test/CodeGen/AMDGPU/annotate-existing-abi-attributes.ll
rename to llvm/test/Transforms/Attributor/AMDGPU/annotate-existing-abi-attributes.ll
diff --git a/llvm/test/CodeGen/AMDGPU/annotate-kernel-features-hsa-call.ll b/llvm/test/Transforms/Attributor/AMDGPU/annotate-kernel-features-hsa-call.ll
similarity index 100%
rename from llvm/test/CodeGen/AMDGPU/annotate-kernel-features-hsa-call.ll
rename to llvm/test/Transforms/Attributor/AMDGPU/annotate-kernel-features-hsa-call.ll
diff --git a/llvm/test/CodeGen/AMDGPU/annotate-kernel-features-hsa.ll b/llvm/test/Transforms/Attributor/AMDGPU/annotate-kernel-features-hsa.ll
similarity index 100%
rename from llvm/test/CodeGen/AMDGPU/annotate-kernel-features-hsa.ll
rename to llvm/test/Transforms/Attributor/AMDGPU/annotate-kernel-features-hsa.ll
diff --git a/llvm/test/CodeGen/AMDGPU/annotate-kernel-features.ll b/llvm/test/Transforms/Attributor/AMDGPU/annotate-kernel-features.ll
similarity index 100%
rename from llvm/test/CodeGen/AMDGPU/annotate-kernel-features.ll
rename to llvm/test/Transforms/Attributor/AMDGPU/annotate-kernel-features.ll
diff --git a/llvm/test/CodeGen/AMDGPU/attr-amdgpu-max-num-workgroups-propagate.ll b/llvm/test/Transforms/Attributor/AMDGPU/attr-amdgpu-max-num-workgroups-propagate.ll
similarity index 100%
rename from llvm/test/CodeGen/AMDGPU/attr-amdgpu-max-num-workgroups-propagate.ll
rename to llvm/test/Transforms/Attributor/AMDGPU/attr-amdgpu-max-num-workgroups-propagate.ll
diff --git a/llvm/test/CodeGen/AMDGPU/attributor-flatscratchinit-undefined-behavior.ll b/llvm/test/Transforms/Attributor/AMDGPU/attributor-flatscratchinit-undefined-behavior.ll
similarity index 100%
rename from llvm/test/CodeGen/AMDGPU/attributor-flatscratchinit-undefined-behavior.ll
rename to llvm/test/Transforms/Attributor/AMDGPU/attributor-flatscratchinit-undefined-behavior.ll
diff --git a/llvm/test/CodeGen/AMDGPU/attributor-flatscratchinit.ll b/llvm/test/Transforms/Attributor/AMDGPU/attributor-flatscratchinit.ll
similarity index 100%
rename from llvm/test/CodeGen/AMDGPU/attributor-flatscratchinit.ll
rename to llvm/test/Transforms/Attributor/AMDGPU/attributor-flatscratchinit.ll
diff --git a/llvm/test/CodeGen/AMDGPU/attributor-loop-issue-58639.ll b/llvm/test/Transforms/Attributor/AMDGPU/attributor-loop-issue-58639.ll
similarity index 100%
rename from llvm/test/CodeGen/AMDGPU/attributor-loop-issue-58639.ll
rename to llvm/test/Transforms/Attributor/AMDGPU/attributor-loop-issue-58639.ll
diff --git a/llvm/test/CodeGen/AMDGPU/direct-indirect-call.ll b/llvm/test/Transforms/Attributor/AMDGPU/direct-indirect-call.ll
similarity index 100%
rename from llvm/test/CodeGen/AMDGPU/direct-indirect-call.ll
rename to llvm/test/Transforms/Attributor/AMDGPU/direct-indirect-call.ll
diff --git a/llvm/test/CodeGen/AMDGPU/duplicate-attribute-indirect.ll b/llvm/test/Transforms/Attributor/AMDGPU/duplicate-attribute-indirect.ll
similarity index 100%
rename from llvm/test/CodeGen/AMDGPU/duplicate-attribute-indirect.ll
rename to llvm/test/Transforms/Attributor/AMDGPU/duplicate-attribute-indirect.ll
diff --git a/llvm/test/CodeGen/AMDGPU/implicitarg-offset-attributes.ll b/llvm/test/Transforms/Attributor/AMDGPU/implicitarg-offset-attributes.ll
similarity index 100%
rename from llvm/test/CodeGen/AMDGPU/implicitarg-offset-attributes.ll
rename to llvm/test/Transforms/Attributor/AMDGPU/implicitarg-offset-attributes.ll
diff --git a/llvm/test/CodeGen/AMDGPU/indirect-call-set-from-other-function.ll b/llvm/test/Transforms/Attributor/AMDGPU/indirect-call-set-from-other-function.ll
similarity index 100%
rename from llvm/test/CodeGen/AMDGPU/indirect-call-set-from-other-function.ll
rename to llvm/test/Transforms/Attributor/AMDGPU/indirect-call-set-from-other-function.ll
diff --git a/llvm/test/CodeGen/AMDGPU/issue120256-annotate-constexpr-addrspacecast.ll b/llvm/test/Transforms/Attributor/AMDGPU/issue120256-annotate-constexpr-addrspacecast.ll
similarity index 100%
rename from llvm/test/CodeGen/AMDGPU/issue120256-annotate-constexpr-addrspacecast.ll
rename to llvm/test/Transforms/Attributor/AMDGPU/issue120256-annotate-constexpr-addrspacecast.ll
diff --git a/llvm/test/CodeGen/AMDGPU/propagate-flat-work-group-size.ll b/llvm/test/Transforms/Attributor/AMDGPU/propagate-flat-work-group-size.ll
similarity index 100%
rename from llvm/test/CodeGen/AMDGPU/propagate-flat-work-group-size.ll
rename to llvm/test/Transforms/Attributor/AMDGPU/propagate-flat-work-group-size.ll
diff --git a/llvm/test/CodeGen/AMDGPU/propagate-waves-per-eu.ll b/llvm/test/Transforms/Attributor/AMDGPU/propagate-waves-per-eu.ll
similarity index 100%
rename from llvm/test/CodeGen/AMDGPU/propagate-waves-per-eu.ll
rename to llvm/test/Transforms/Attributor/AMDGPU/propagate-waves-per-eu.ll
diff --git a/llvm/test/CodeGen/AMDGPU/recursive_global_initializer.ll b/llvm/test/Transforms/Attributor/AMDGPU/recursive_global_initializer.ll
similarity index 100%
rename from llvm/test/CodeGen/AMDGPU/recursive_global_initializer.ll
rename to llvm/test/Transforms/Attributor/AMDGPU/recursive_global_initializer.ll
diff --git a/llvm/test/CodeGen/AMDGPU/remove-no-kernel-id-attribute.ll b/llvm/test/Transforms/Attributor/AMDGPU/remove-no-kernel-id-attribute.ll
similarity index 100%
rename from llvm/test/CodeGen/AMDGPU/remove-no-kernel-id-attribute.ll
rename to llvm/test/Transforms/Attributor/AMDGPU/remove-no-kernel-id-attribute.ll
diff --git a/llvm/test/CodeGen/AMDGPU/simple-indirect-call-2.ll b/llvm/test/Transforms/Attributor/AMDGPU/simple-indirect-call-2.ll
similarity index 100%
rename from llvm/test/CodeGen/AMDGPU/simple-indirect-call-2.ll
rename to llvm/test/Transforms/Attributor/AMDGPU/simple-indirect-call-2.ll
diff --git a/llvm/test/CodeGen/AMDGPU/uniform-work-group-attribute-missing.ll b/llvm/test/Transforms/Attributor/AMDGPU/uniform-work-group-attribute-missing.ll
similarity index 100%
rename from llvm/test/CodeGen/AMDGPU/uniform-work-group-attribute-missing.ll
rename to llvm/test/Transforms/Attributor/AMDGPU/uniform-work-group-attribute-missing.ll
diff --git a/llvm/test/CodeGen/AMDGPU/uniform-work-group-multistep.ll b/llvm/test/Transforms/Attributor/AMDGPU/uniform-work-group-multistep.ll
similarity index 100%
rename from llvm/test/CodeGen/AMDGPU/uniform-work-group-multistep.ll
rename to llvm/test/Transforms/Attributor/AMDGPU/uniform-work-group-multistep.ll
diff --git a/llvm/test/CodeGen/AMDGPU/uniform-work-group-nested-function-calls.ll b/llvm/test/Transforms/Attributor/AMDGPU/uniform-work-group-nested-function-calls.ll
similarity index 100%
rename from llvm/test/CodeGen/AMDGPU/uniform-work-group-nested-function-calls.ll
rename to llvm/test/Transforms/Attributor/AMDGPU/uniform-work-group-nested-function-calls.ll
diff --git a/llvm/test/CodeGen/AMDGPU/uniform-work-group-prevent-attribute-propagation.ll b/llvm/test/Transforms/Attributor/AMDGPU/uniform-work-group-prevent-attribute-propagation.ll
similarity index 100%
rename from llvm/test/CodeGen/AMDGPU/uniform-work-group-prevent-attribute-propagation.ll
rename to llvm/test/Transforms/Attributor/AMDGPU/uniform-work-group-prevent-attribute-propagation.ll
diff --git a/llvm/test/CodeGen/AMDGPU/uniform-work-group-propagate-attribute.ll b/llvm/test/Transforms/Attributor/AMDGPU/uniform-work-group-propagate-attribute.ll
similarity index 100%
rename from llvm/test/CodeGen/AMDGPU/uniform-work-group-propagate-attribute.ll
rename to llvm/test/Transforms/Attributor/AMDGPU/uniform-work-group-propagate-attribute.ll
diff --git a/llvm/test/CodeGen/AMDGPU/uniform-work-group-recursion-test.ll b/llvm/test/Transforms/Attributor/AMDGPU/uniform-work-group-recursion-test.ll
similarity index 100%
rename from llvm/test/CodeGen/AMDGPU/uniform-work-group-recursion-test.ll
rename to llvm/test/Transforms/Attributor/AMDGPU/uniform-work-group-recursion-test.ll
diff --git a/llvm/test/CodeGen/AMDGPU/uniform-work-group-test.ll b/llvm/test/Transforms/Attributor/AMDGPU/uniform-work-group-test.ll
similarity index 100%
rename from llvm/test/CodeGen/AMDGPU/uniform-work-group-test.ll
rename to llvm/test/Transforms/Attributor/AMDGPU/uniform-work-group-test.ll