diff --git a/llvm/test/Analysis/BasicAA/cs-cs-arm.ll b/llvm/test/Analysis/BasicAA/cs-cs-arm.ll
--- a/llvm/test/Analysis/BasicAA/cs-cs-arm.ll
+++ b/llvm/test/Analysis/BasicAA/cs-cs-arm.ll
@@ -1,5 +1,8 @@
 ; RUN: opt < %s -aa-pipeline=basic-aa -passes=aa-eval -print-all-alias-modref-info -disable-output 2>&1 | FileCheck %s
-; REQUIRES: arm
+; REQUIRES: arm-registered-target
+; This hasn't been run in a long time and it no longer matches reality.
+; Filed issue #58738.
+; XFAIL: *
 
 target datalayout = "e-p:32:32:32-i1:8:32-i8:8:32-i16:16:32-i32:32:32-i64:32:32-f32:32:32-f64:32:32-v64:32:64-v128:32:128-a0:0:32-n32"
 target triple = "arm-apple-ios"
diff --git a/llvm/test/Analysis/BasicAA/intrinsics-arm.ll b/llvm/test/Analysis/BasicAA/intrinsics-arm.ll
--- a/llvm/test/Analysis/BasicAA/intrinsics-arm.ll
+++ b/llvm/test/Analysis/BasicAA/intrinsics-arm.ll
@@ -1,5 +1,5 @@
 ; RUN: opt -aa-pipeline=basic-aa -passes=gvn -S < %s | FileCheck %s
-; REQUIRES: arm
+; REQUIRES: arm-registered-target
 
 target datalayout = "e-p:32:32:32-i1:8:32-i8:8:32-i16:16:32-i32:32:32-i64:32:32-f32:32:32-f64:32:32-v64:32:64-v128:32:128-a0:0:32-n32"
 
diff --git a/llvm/test/CodeGen/Generic/DbgValueAggregate.ll b/llvm/test/CodeGen/Generic/DbgValueAggregate.ll
--- a/llvm/test/CodeGen/Generic/DbgValueAggregate.ll
+++ b/llvm/test/CodeGen/Generic/DbgValueAggregate.ll
@@ -1,5 +1,5 @@
 ; RUN: llc -O0 -global-isel < %s | FileCheck %s
-; REQUIRES: aarch64
+; REQUIRES: aarch64-registered-target
 target triple = "aarch64-unknown-linux-gnu"
 
 define void @MAIN_() #0 {
diff --git a/llvm/test/CodeGen/Hexagon/abi-padding-2.ll b/llvm/test/CodeGen/Hexagon/abi-padding-2.ll
--- a/llvm/test/CodeGen/Hexagon/abi-padding-2.ll
+++ b/llvm/test/CodeGen/Hexagon/abi-padding-2.ll
@@ -1,5 +1,4 @@
 ; RUN: llc -march=hexagon -mcpu=hexagonv65 < %s | FileCheck %s
-; REQUIRES: hexagon
 
 ; C file was:
 ; struct S { char b; long long a; };
diff --git a/llvm/test/CodeGen/Hexagon/abi-padding.ll b/llvm/test/CodeGen/Hexagon/abi-padding.ll
--- a/llvm/test/CodeGen/Hexagon/abi-padding.ll
+++ b/llvm/test/CodeGen/Hexagon/abi-padding.ll
@@ -1,5 +1,4 @@
 ; RUN: llc -march=hexagon -mcpu=hexagonv65 < %s | FileCheck %s
-; REQUIRES: hexagon
 
 ; C file was:
 ; struct S { int a[3];};
diff --git a/llvm/test/CodeGen/PowerPC/read-set-flm.ll b/llvm/test/CodeGen/PowerPC/read-set-flm.ll
--- a/llvm/test/CodeGen/PowerPC/read-set-flm.ll
+++ b/llvm/test/CodeGen/PowerPC/read-set-flm.ll
@@ -2,7 +2,7 @@
 ; RUN: llc < %s -mtriple powerpc64le-unknown-linux | FileCheck %s
 ; RUN: llc < %s -mtriple powerpc64le-unknown-linux -debug-only=machine-scheduler \
 ; RUN:   2>&1 | FileCheck %s --check-prefix=LOG
-; REQUIRES: DEBUG
+; REQUIRES: asserts
 
 define double @in_nostrict(double %a, double %b, double %c, double %d) {
 ; CHECK-LABEL: in_nostrict:
diff --git a/llvm/test/MC/AsmParser/layout-interdependency.s b/llvm/test/MC/AsmParser/layout-interdependency.s
--- a/llvm/test/MC/AsmParser/layout-interdependency.s
+++ b/llvm/test/MC/AsmParser/layout-interdependency.s
@@ -1,5 +1,5 @@
 # RUN: not llvm-mc --filetype=obj %s -o /dev/null 2>&1 | FileCheck %s
-# REQUIRES: defaut_triple
+# REQUIRES: default_triple
 
 fct_end:
 
diff --git a/llvm/test/tools/llvm-objcopy/ELF/update-section.test b/llvm/test/tools/llvm-objcopy/ELF/update-section.test
--- a/llvm/test/tools/llvm-objcopy/ELF/update-section.test
+++ b/llvm/test/tools/llvm-objcopy/ELF/update-section.test
@@ -1,4 +1,4 @@
-# REQUIRES: x86
+# REQUIRES: x86-registered-target
 
 # RUN: yaml2obj %s -o %t
 
diff --git a/llvm/test/tools/llvm-readobj/COFF/call-graph-profile-err.s b/llvm/test/tools/llvm-readobj/COFF/call-graph-profile-err.s
--- a/llvm/test/tools/llvm-readobj/COFF/call-graph-profile-err.s
+++ b/llvm/test/tools/llvm-readobj/COFF/call-graph-profile-err.s
@@ -1,4 +1,4 @@
-# REQUIRES: x86
+# REQUIRES: x86-registered-target
 # RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s -o %t
 # RUN: not llvm-readobj %t --cg-profile 2>&1 | FileCheck --check-prefix=ERR %s
 
diff --git a/llvm/test/tools/llvm-readobj/COFF/call-graph-profile.s b/llvm/test/tools/llvm-readobj/COFF/call-graph-profile.s
--- a/llvm/test/tools/llvm-readobj/COFF/call-graph-profile.s
+++ b/llvm/test/tools/llvm-readobj/COFF/call-graph-profile.s
@@ -1,4 +1,4 @@
-# REQUIRES: x86
+# REQUIRES: x86-registered-target
 # RUN: llvm-mc -filetype=obj -triple x86_64-pc-win32 %s -o %t
 # RUN: llvm-readobj %t --cg-profile | FileCheck %s