[Lldb-commits] [lldb] 8a64d80 - [lldb] Require x86 backend for a bunch of DWARF tests

David Spickett via lldb-commits lldb-commits at lists.llvm.org
Tue Apr 13 01:47:49 PDT 2021 

Author: David Spickett
Date: 2021-04-13T08:47:41Z
New Revision: 8a64d80a959bf2844df33f9112e456f33de7b468

URL: https://github.com/llvm/llvm-project/commit/8a64d80a959bf2844df33f9112e456f33de7b468
DIFF: https://github.com/llvm/llvm-project/commit/8a64d80a959bf2844df33f9112e456f33de7b468.diff

LOG: [lldb] Require x86 backend for a bunch of DWARF tests

By moving them into a folder with a local lit config
requiring x86. All these tests use x86 target triples.

There are two tests that require target-x86_64 because
they run program files (instead of just needing the backend).
Those are moved to the x86 folder also but their REQUIRES are
unchanged.

Reviewed By: JDevlieghere

Differential Revision: https://reviews.llvm.org/D100193

Added: 
    lldb/test/Shell/SymbolFile/DWARF/x86/DW_AT_const_value-bitfields.s
    lldb/test/Shell/SymbolFile/DWARF/x86/DW_AT_const_value.s
    lldb/test/Shell/SymbolFile/DWARF/x86/DW_AT_data_bit_offset-DW_OP_stack_value.s
    lldb/test/Shell/SymbolFile/DWARF/x86/DW_AT_decl_file-DW_AT_specification-crosscu.s
    lldb/test/Shell/SymbolFile/DWARF/x86/DW_AT_declaration-with-children.s
    lldb/test/Shell/SymbolFile/DWARF/x86/DW_AT_location-DW_AT_const_value.s
    lldb/test/Shell/SymbolFile/DWARF/x86/DW_AT_loclists_base.s
    lldb/test/Shell/SymbolFile/DWARF/x86/DW_AT_low_pc-addrx.s
    lldb/test/Shell/SymbolFile/DWARF/x86/DW_OP_piece-smaller-than-struct.s
    lldb/test/Shell/SymbolFile/DWARF/x86/DW_OP_piece-struct.s
    lldb/test/Shell/SymbolFile/DWARF/x86/DW_TAG_GNU_call_site-DW_AT_low_pc.s
    lldb/test/Shell/SymbolFile/DWARF/x86/DW_TAG_basic_type_DW_ATE_UTF_nonC.ll
    lldb/test/Shell/SymbolFile/DWARF/x86/DW_TAG_variable-DW_AT_const_value.s
    lldb/test/Shell/SymbolFile/DWARF/x86/DW_TAG_variable-DW_AT_decl_file-DW_AT_abstract_origin-crosscu1.s
    lldb/test/Shell/SymbolFile/DWARF/x86/DW_TAG_variable-invalid_location.s
    lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/DW_TAG_variable-DW_AT_decl_file-DW_AT_abstract_origin-crosscu2.s
    lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/ModuleOwnership/A.h
    lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/ModuleOwnership/B.h
    lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/ModuleOwnership/module.modulemap
    lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/debug-line-basic.script
    lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/debug-types-basic.cpp
    lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/debug_loc-aslr.yaml
    lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/dir-separator-no-comp-dir-relative-name.lldbinit
    lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/dir-separator-posix.lldbinit
    lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/dir-separator-windows.lldbinit
    lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/find-variable-file-2.cpp
    lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/subprogram_ranges.s
    lldb/test/Shell/SymbolFile/DWARF/x86/apple-index-is-used.cpp
    lldb/test/Shell/SymbolFile/DWARF/x86/array-sizes.s
    lldb/test/Shell/SymbolFile/DWARF/x86/childless-compile-unit.s
    lldb/test/Shell/SymbolFile/DWARF/x86/compilercontext.ll
    lldb/test/Shell/SymbolFile/DWARF/x86/debug-line-basic.s
    lldb/test/Shell/SymbolFile/DWARF/x86/debug-names-compressed.cpp
    lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-address-ranges.s
    lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-basic.test
    lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-dwarf5.s
    lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-dwo-cross-reference.cpp
    lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-line-tables.s
    lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-missing-signature.test
    lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-signature-loop.s
    lldb/test/Shell/SymbolFile/DWARF/x86/debug_aranges-empty-section.s
    lldb/test/Shell/SymbolFile/DWARF/x86/debug_line-relative_path.s
    lldb/test/Shell/SymbolFile/DWARF/x86/debug_line-tombstone.s
    lldb/test/Shell/SymbolFile/DWARF/x86/debug_loc-aslr.s
    lldb/test/Shell/SymbolFile/DWARF/x86/debug_loc.s
    lldb/test/Shell/SymbolFile/DWARF/x86/debug_loc_and_loclists.s
    lldb/test/Shell/SymbolFile/DWARF/x86/debug_loclists-dwo.s
    lldb/test/Shell/SymbolFile/DWARF/x86/debug_ranges-missing-section.s
    lldb/test/Shell/SymbolFile/DWARF/x86/debug_ranges.s
    lldb/test/Shell/SymbolFile/DWARF/x86/debug_ranges_and_rnglists.test
    lldb/test/Shell/SymbolFile/DWARF/x86/debug_rnglists-dwo.s
    lldb/test/Shell/SymbolFile/DWARF/x86/debug_rnglists.s
    lldb/test/Shell/SymbolFile/DWARF/x86/dir-separator-no-comp-dir-relative-name.s
    lldb/test/Shell/SymbolFile/DWARF/x86/dir-separator-no-comp-dir.s
    lldb/test/Shell/SymbolFile/DWARF/x86/dir-separator-posix.s
    lldb/test/Shell/SymbolFile/DWARF/x86/dir-separator-windows.s
    lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-atomic.s
    lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-debug_line-file-index.s
    lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-debug_line.s
    lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-implicit-const.s
    lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-index-is-used.cpp
    lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-line-strp.s
    lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-partial-index.cpp
    lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-split.s
    lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5_locations.s
    lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5_tu_index_abbrev_offset.s
    lldb/test/Shell/SymbolFile/DWARF/x86/dwo-type-in-main-file.s
    lldb/test/Shell/SymbolFile/DWARF/x86/dwp-debug-types.s
    lldb/test/Shell/SymbolFile/DWARF/x86/dwp-separate-debug-file.cpp
    lldb/test/Shell/SymbolFile/DWARF/x86/dwp.s
    lldb/test/Shell/SymbolFile/DWARF/x86/find-basic-function.cpp
    lldb/test/Shell/SymbolFile/DWARF/x86/find-basic-namespace.cpp
    lldb/test/Shell/SymbolFile/DWARF/x86/find-basic-type.cpp
    lldb/test/Shell/SymbolFile/DWARF/x86/find-basic-variable.cpp
    lldb/test/Shell/SymbolFile/DWARF/x86/find-function-regex.cpp
    lldb/test/Shell/SymbolFile/DWARF/x86/find-inline-method.s
    lldb/test/Shell/SymbolFile/DWARF/x86/find-method-local-struct.cpp
    lldb/test/Shell/SymbolFile/DWARF/x86/find-method.cpp
    lldb/test/Shell/SymbolFile/DWARF/x86/find-qualified-variable.cpp
    lldb/test/Shell/SymbolFile/DWARF/x86/find-variable-dwo.cpp
    lldb/test/Shell/SymbolFile/DWARF/x86/find-variable-file.cpp
    lldb/test/Shell/SymbolFile/DWARF/x86/gnu-style-compression.cpp
    lldb/test/Shell/SymbolFile/DWARF/x86/inline-function-address-shared.test
    lldb/test/Shell/SymbolFile/DWARF/x86/inline-function-address.ll
    lldb/test/Shell/SymbolFile/DWARF/x86/limit-debug-info.s
    lldb/test/Shell/SymbolFile/DWARF/x86/lit.local.cfg
    lldb/test/Shell/SymbolFile/DWARF/x86/module-ownership.mm
    lldb/test/Shell/SymbolFile/DWARF/x86/parallel-indexing-stress.s
    lldb/test/Shell/SymbolFile/DWARF/x86/split-dwarf-inlining.cpp
    lldb/test/Shell/SymbolFile/DWARF/x86/split-dwarf-multiple-cu.ll
    lldb/test/Shell/SymbolFile/DWARF/x86/static_scope.s
    lldb/test/Shell/SymbolFile/DWARF/x86/subprogram_ranges.test
    lldb/test/Shell/SymbolFile/DWARF/x86/win-i386-line-table.s

Modified: 
    

Removed: 
    lldb/test/Shell/SymbolFile/DWARF/DW_AT_const_value-bitfields.s
    lldb/test/Shell/SymbolFile/DWARF/DW_AT_const_value.s
    lldb/test/Shell/SymbolFile/DWARF/DW_AT_data_bit_offset-DW_OP_stack_value.s
    lldb/test/Shell/SymbolFile/DWARF/DW_AT_decl_file-DW_AT_specification-crosscu.s
    lldb/test/Shell/SymbolFile/DWARF/DW_AT_declaration-with-children.s
    lldb/test/Shell/SymbolFile/DWARF/DW_AT_location-DW_AT_const_value.s
    lldb/test/Shell/SymbolFile/DWARF/DW_AT_loclists_base.s
    lldb/test/Shell/SymbolFile/DWARF/DW_AT_low_pc-addrx.s
    lldb/test/Shell/SymbolFile/DWARF/DW_OP_piece-smaller-than-struct.s
    lldb/test/Shell/SymbolFile/DWARF/DW_OP_piece-struct.s
    lldb/test/Shell/SymbolFile/DWARF/DW_TAG_GNU_call_site-DW_AT_low_pc.s
    lldb/test/Shell/SymbolFile/DWARF/DW_TAG_basic_type_DW_ATE_UTF_nonC.ll
    lldb/test/Shell/SymbolFile/DWARF/DW_TAG_variable-DW_AT_const_value.s
    lldb/test/Shell/SymbolFile/DWARF/DW_TAG_variable-DW_AT_decl_file-DW_AT_abstract_origin-crosscu1.s
    lldb/test/Shell/SymbolFile/DWARF/DW_TAG_variable-invalid_location.s
    lldb/test/Shell/SymbolFile/DWARF/Inputs/DW_TAG_variable-DW_AT_decl_file-DW_AT_abstract_origin-crosscu2.s
    lldb/test/Shell/SymbolFile/DWARF/Inputs/ModuleOwnership/A.h
    lldb/test/Shell/SymbolFile/DWARF/Inputs/ModuleOwnership/B.h
    lldb/test/Shell/SymbolFile/DWARF/Inputs/ModuleOwnership/module.modulemap
    lldb/test/Shell/SymbolFile/DWARF/Inputs/debug-line-basic.script
    lldb/test/Shell/SymbolFile/DWARF/Inputs/debug-types-basic.cpp
    lldb/test/Shell/SymbolFile/DWARF/Inputs/debug_loc-aslr.yaml
    lldb/test/Shell/SymbolFile/DWARF/Inputs/dir-separator-no-comp-dir-relative-name.lldbinit
    lldb/test/Shell/SymbolFile/DWARF/Inputs/dir-separator-posix.lldbinit
    lldb/test/Shell/SymbolFile/DWARF/Inputs/dir-separator-windows.lldbinit
    lldb/test/Shell/SymbolFile/DWARF/Inputs/find-variable-file-2.cpp
    lldb/test/Shell/SymbolFile/DWARF/Inputs/subprogram_ranges.s
    lldb/test/Shell/SymbolFile/DWARF/apple-index-is-used.cpp
    lldb/test/Shell/SymbolFile/DWARF/array-sizes.s
    lldb/test/Shell/SymbolFile/DWARF/childless-compile-unit.s
    lldb/test/Shell/SymbolFile/DWARF/compilercontext.ll
    lldb/test/Shell/SymbolFile/DWARF/debug-line-basic.s
    lldb/test/Shell/SymbolFile/DWARF/debug-names-compressed.cpp
    lldb/test/Shell/SymbolFile/DWARF/debug-types-address-ranges.s
    lldb/test/Shell/SymbolFile/DWARF/debug-types-basic.test
    lldb/test/Shell/SymbolFile/DWARF/debug-types-dwarf5.s
    lldb/test/Shell/SymbolFile/DWARF/debug-types-dwo-cross-reference.cpp
    lldb/test/Shell/SymbolFile/DWARF/debug-types-line-tables.s
    lldb/test/Shell/SymbolFile/DWARF/debug-types-missing-signature.test
    lldb/test/Shell/SymbolFile/DWARF/debug-types-signature-loop.s
    lldb/test/Shell/SymbolFile/DWARF/debug_aranges-empty-section.s
    lldb/test/Shell/SymbolFile/DWARF/debug_line-relative_path.s
    lldb/test/Shell/SymbolFile/DWARF/debug_line-tombstone.s
    lldb/test/Shell/SymbolFile/DWARF/debug_loc-aslr.s
    lldb/test/Shell/SymbolFile/DWARF/debug_loc.s
    lldb/test/Shell/SymbolFile/DWARF/debug_loc_and_loclists.s
    lldb/test/Shell/SymbolFile/DWARF/debug_loclists-dwo.s
    lldb/test/Shell/SymbolFile/DWARF/debug_ranges-missing-section.s
    lldb/test/Shell/SymbolFile/DWARF/debug_ranges.s
    lldb/test/Shell/SymbolFile/DWARF/debug_ranges_and_rnglists.test
    lldb/test/Shell/SymbolFile/DWARF/debug_rnglists-dwo.s
    lldb/test/Shell/SymbolFile/DWARF/debug_rnglists.s
    lldb/test/Shell/SymbolFile/DWARF/dir-separator-no-comp-dir-relative-name.s
    lldb/test/Shell/SymbolFile/DWARF/dir-separator-no-comp-dir.s
    lldb/test/Shell/SymbolFile/DWARF/dir-separator-posix.s
    lldb/test/Shell/SymbolFile/DWARF/dir-separator-windows.s
    lldb/test/Shell/SymbolFile/DWARF/dwarf5-atomic.s
    lldb/test/Shell/SymbolFile/DWARF/dwarf5-debug_line-file-index.s
    lldb/test/Shell/SymbolFile/DWARF/dwarf5-debug_line.s
    lldb/test/Shell/SymbolFile/DWARF/dwarf5-implicit-const.s
    lldb/test/Shell/SymbolFile/DWARF/dwarf5-index-is-used.cpp
    lldb/test/Shell/SymbolFile/DWARF/dwarf5-line-strp.s
    lldb/test/Shell/SymbolFile/DWARF/dwarf5-partial-index.cpp
    lldb/test/Shell/SymbolFile/DWARF/dwarf5-split.s
    lldb/test/Shell/SymbolFile/DWARF/dwarf5_locations.s
    lldb/test/Shell/SymbolFile/DWARF/dwarf5_tu_index_abbrev_offset.s
    lldb/test/Shell/SymbolFile/DWARF/dwo-type-in-main-file.s
    lldb/test/Shell/SymbolFile/DWARF/dwp-debug-types.s
    lldb/test/Shell/SymbolFile/DWARF/dwp-separate-debug-file.cpp
    lldb/test/Shell/SymbolFile/DWARF/dwp.s
    lldb/test/Shell/SymbolFile/DWARF/find-basic-function.cpp
    lldb/test/Shell/SymbolFile/DWARF/find-basic-namespace.cpp
    lldb/test/Shell/SymbolFile/DWARF/find-basic-type.cpp
    lldb/test/Shell/SymbolFile/DWARF/find-basic-variable.cpp
    lldb/test/Shell/SymbolFile/DWARF/find-function-regex.cpp
    lldb/test/Shell/SymbolFile/DWARF/find-inline-method.s
    lldb/test/Shell/SymbolFile/DWARF/find-method-local-struct.cpp
    lldb/test/Shell/SymbolFile/DWARF/find-method.cpp
    lldb/test/Shell/SymbolFile/DWARF/find-qualified-variable.cpp
    lldb/test/Shell/SymbolFile/DWARF/find-variable-dwo.cpp
    lldb/test/Shell/SymbolFile/DWARF/find-variable-file.cpp
    lldb/test/Shell/SymbolFile/DWARF/gnu-style-compression.cpp
    lldb/test/Shell/SymbolFile/DWARF/inline-function-address-shared.test
    lldb/test/Shell/SymbolFile/DWARF/inline-function-address.ll
    lldb/test/Shell/SymbolFile/DWARF/limit-debug-info.s
    lldb/test/Shell/SymbolFile/DWARF/module-ownership.mm
    lldb/test/Shell/SymbolFile/DWARF/parallel-indexing-stress.s
    lldb/test/Shell/SymbolFile/DWARF/split-dwarf-inlining.cpp
    lldb/test/Shell/SymbolFile/DWARF/split-dwarf-multiple-cu.ll
    lldb/test/Shell/SymbolFile/DWARF/static_scope.s
    lldb/test/Shell/SymbolFile/DWARF/subprogram_ranges.test
    lldb/test/Shell/SymbolFile/DWARF/win-i386-line-table.s


################################################################################
diff  --git a/lldb/test/Shell/SymbolFile/DWARF/DW_AT_const_value-bitfields.s b/lldb/test/Shell/SymbolFile/DWARF/x86/DW_AT_const_value-bitfields.s
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/DW_AT_const_value-bitfields.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/DW_AT_const_value-bitfields.s

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/DW_AT_const_value.s b/lldb/test/Shell/SymbolFile/DWARF/x86/DW_AT_const_value.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/DW_AT_const_value.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/DW_AT_const_value.s
index 2275ff25ce97..a9421c5fa854 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/DW_AT_const_value.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/DW_AT_const_value.s
@@ -1,8 +1,6 @@
 # Test handling of (optimized-out/location-less) variables whose value is
 # specified by DW_AT_const_value
 
-# REQUIRES: x86
-
 # RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux %s -o %t
 # RUN: %lldb %t \
 # RUN:   -o "target variable udata data1 data2 data4 data8 string strp ref4 udata_ptr" \

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/DW_AT_data_bit_offset-DW_OP_stack_value.s b/lldb/test/Shell/SymbolFile/DWARF/x86/DW_AT_data_bit_offset-DW_OP_stack_value.s
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/DW_AT_data_bit_offset-DW_OP_stack_value.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/DW_AT_data_bit_offset-DW_OP_stack_value.s

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/DW_AT_decl_file-DW_AT_specification-crosscu.s b/lldb/test/Shell/SymbolFile/DWARF/x86/DW_AT_decl_file-DW_AT_specification-crosscu.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/DW_AT_decl_file-DW_AT_specification-crosscu.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/DW_AT_decl_file-DW_AT_specification-crosscu.s
index c8c85cbc42df..b71ded5e4080 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/DW_AT_decl_file-DW_AT_specification-crosscu.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/DW_AT_decl_file-DW_AT_specification-crosscu.s
@@ -2,8 +2,6 @@
 # DW_TAG_compile_unit is using the DW_TAG_compile_unit->DW_AT_stmt_list where the
 # DW_AT_decl_file is located (and not where the DW_AT_specification is located).
 
-# REQUIRES: x86
-
 # RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux %s -o %t
 # RUN: %lldb %t \
 # RUN:   -o "image lookup -v -n main" \

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/DW_AT_declaration-with-children.s b/lldb/test/Shell/SymbolFile/DWARF/x86/DW_AT_declaration-with-children.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/DW_AT_declaration-with-children.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/DW_AT_declaration-with-children.s
index 0de018afd1b9..bc462ca32e9c 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/DW_AT_declaration-with-children.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/DW_AT_declaration-with-children.s
@@ -2,8 +2,6 @@
 # can be produced due to vtable-based type homing, or other -flimit-debug-info
 # optimizations.
 
-# REQUIRES: x86
-
 # RUN: split-file %s %t
 # RUN: llvm-mc --triple x86_64-pc-linux %t/asm --filetype=obj -o %t.o
 # RUN: %lldb -o "settings set interpreter.stop-command-source-on-error false" \

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/DW_AT_location-DW_AT_const_value.s b/lldb/test/Shell/SymbolFile/DWARF/x86/DW_AT_location-DW_AT_const_value.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/DW_AT_location-DW_AT_const_value.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/DW_AT_location-DW_AT_const_value.s
index 08ee77175f77..64ab67004f01 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/DW_AT_location-DW_AT_const_value.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/DW_AT_location-DW_AT_const_value.s
@@ -2,8 +2,6 @@
 ## const_value attributes. Such values are produced in C++ for class-level
 ## static constexpr variables.
 
-# REQUIRES: x86
-
 # RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux %s -o %t
 # RUN: %lldb %t -o "target variable A::x A::y" -o exit | FileCheck %s
 

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/DW_AT_loclists_base.s b/lldb/test/Shell/SymbolFile/DWARF/x86/DW_AT_loclists_base.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/DW_AT_loclists_base.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/DW_AT_loclists_base.s
index 6ff35f8c6596..d83d0cb2bde3 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/DW_AT_loclists_base.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/DW_AT_loclists_base.s
@@ -1,5 +1,3 @@
-# REQUIRES: x86
-
 # RUN: llvm-mc -triple=x86_64-pc-linux -filetype=obj %s > %t
 # RUN: %lldb %t -o "image lookup -v -s lookup_loclists" -o exit | FileCheck %s
 

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/DW_AT_low_pc-addrx.s b/lldb/test/Shell/SymbolFile/DWARF/x86/DW_AT_low_pc-addrx.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/DW_AT_low_pc-addrx.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/DW_AT_low_pc-addrx.s
index ad9b20be4056..bb152c1dac8a 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/DW_AT_low_pc-addrx.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/DW_AT_low_pc-addrx.s
@@ -1,5 +1,3 @@
-# REQUIRES: x86
-
 # RUN: llvm-mc -triple=x86_64-pc-linux -filetype=obj %s > %t
 # RUN: %lldb %t -o "image lookup -v -s lookup_rnglists" \
 # RUN:   -o exit | FileCheck %s

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/DW_OP_piece-smaller-than-struct.s b/lldb/test/Shell/SymbolFile/DWARF/x86/DW_OP_piece-smaller-than-struct.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/DW_OP_piece-smaller-than-struct.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/DW_OP_piece-smaller-than-struct.s
index 1448993672a1..96e4abe110e6 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/DW_OP_piece-smaller-than-struct.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/DW_OP_piece-smaller-than-struct.s
@@ -1,5 +1,3 @@
-# REQUIRES: x86
-
 # RUN: llvm-mc -filetype=obj -o %t -triple x86_64-pc-linux %s
 # RUN: %lldb %t -o "target variable reset" -b | FileCheck %s
 

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/DW_OP_piece-struct.s b/lldb/test/Shell/SymbolFile/DWARF/x86/DW_OP_piece-struct.s
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/DW_OP_piece-struct.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/DW_OP_piece-struct.s

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/DW_TAG_GNU_call_site-DW_AT_low_pc.s b/lldb/test/Shell/SymbolFile/DWARF/x86/DW_TAG_GNU_call_site-DW_AT_low_pc.s
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/DW_TAG_GNU_call_site-DW_AT_low_pc.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/DW_TAG_GNU_call_site-DW_AT_low_pc.s

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/DW_TAG_basic_type_DW_ATE_UTF_nonC.ll b/lldb/test/Shell/SymbolFile/DWARF/x86/DW_TAG_basic_type_DW_ATE_UTF_nonC.ll
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/DW_TAG_basic_type_DW_ATE_UTF_nonC.ll
rename to lldb/test/Shell/SymbolFile/DWARF/x86/DW_TAG_basic_type_DW_ATE_UTF_nonC.ll

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/DW_TAG_variable-DW_AT_const_value.s b/lldb/test/Shell/SymbolFile/DWARF/x86/DW_TAG_variable-DW_AT_const_value.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/DW_TAG_variable-DW_AT_const_value.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/DW_TAG_variable-DW_AT_const_value.s
index fdbb173a264f..7ab9a8c61baf 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/DW_TAG_variable-DW_AT_const_value.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/DW_TAG_variable-DW_AT_const_value.s
@@ -1,7 +1,5 @@
 # This tests that lldb is able to print DW_TAG_variable using DW_AT_const_value.
 
-# REQUIRES: x86
-
 # RUN: llvm-mc -triple x86_64-unknown-linux-gnu %s -filetype=obj > %t.o
 # RUN: %lldb %t.o -o "p/x magic64" -o exit | FileCheck %s
 

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/DW_TAG_variable-DW_AT_decl_file-DW_AT_abstract_origin-crosscu1.s b/lldb/test/Shell/SymbolFile/DWARF/x86/DW_TAG_variable-DW_AT_decl_file-DW_AT_abstract_origin-crosscu1.s
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/DW_TAG_variable-DW_AT_decl_file-DW_AT_abstract_origin-crosscu1.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/DW_TAG_variable-DW_AT_decl_file-DW_AT_abstract_origin-crosscu1.s

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/DW_TAG_variable-invalid_location.s b/lldb/test/Shell/SymbolFile/DWARF/x86/DW_TAG_variable-invalid_location.s
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/DW_TAG_variable-invalid_location.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/DW_TAG_variable-invalid_location.s

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/Inputs/DW_TAG_variable-DW_AT_decl_file-DW_AT_abstract_origin-crosscu2.s b/lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/DW_TAG_variable-DW_AT_decl_file-DW_AT_abstract_origin-crosscu2.s
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/Inputs/DW_TAG_variable-DW_AT_decl_file-DW_AT_abstract_origin-crosscu2.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/DW_TAG_variable-DW_AT_decl_file-DW_AT_abstract_origin-crosscu2.s

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/Inputs/ModuleOwnership/A.h b/lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/ModuleOwnership/A.h
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/Inputs/ModuleOwnership/A.h
rename to lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/ModuleOwnership/A.h

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/Inputs/ModuleOwnership/B.h b/lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/ModuleOwnership/B.h
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/Inputs/ModuleOwnership/B.h
rename to lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/ModuleOwnership/B.h

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/Inputs/ModuleOwnership/module.modulemap b/lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/ModuleOwnership/module.modulemap
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/Inputs/ModuleOwnership/module.modulemap
rename to lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/ModuleOwnership/module.modulemap

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/Inputs/debug-line-basic.script b/lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/debug-line-basic.script
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/Inputs/debug-line-basic.script
rename to lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/debug-line-basic.script

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/Inputs/debug-types-basic.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/debug-types-basic.cpp
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/Inputs/debug-types-basic.cpp
rename to lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/debug-types-basic.cpp

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/Inputs/debug_loc-aslr.yaml b/lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/debug_loc-aslr.yaml
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/Inputs/debug_loc-aslr.yaml
rename to lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/debug_loc-aslr.yaml

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/Inputs/dir-separator-no-comp-dir-relative-name.lldbinit b/lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/dir-separator-no-comp-dir-relative-name.lldbinit
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/Inputs/dir-separator-no-comp-dir-relative-name.lldbinit
rename to lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/dir-separator-no-comp-dir-relative-name.lldbinit

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/Inputs/dir-separator-posix.lldbinit b/lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/dir-separator-posix.lldbinit
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/Inputs/dir-separator-posix.lldbinit
rename to lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/dir-separator-posix.lldbinit

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/Inputs/dir-separator-windows.lldbinit b/lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/dir-separator-windows.lldbinit
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/Inputs/dir-separator-windows.lldbinit
rename to lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/dir-separator-windows.lldbinit

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/Inputs/find-variable-file-2.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/find-variable-file-2.cpp
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/Inputs/find-variable-file-2.cpp
rename to lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/find-variable-file-2.cpp

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/Inputs/subprogram_ranges.s b/lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/subprogram_ranges.s
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/Inputs/subprogram_ranges.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/Inputs/subprogram_ranges.s

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/apple-index-is-used.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/apple-index-is-used.cpp
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/apple-index-is-used.cpp
rename to lldb/test/Shell/SymbolFile/DWARF/x86/apple-index-is-used.cpp

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/array-sizes.s b/lldb/test/Shell/SymbolFile/DWARF/x86/array-sizes.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/array-sizes.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/array-sizes.s
index b02be7b8ab0d..d70352d8531e 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/array-sizes.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/array-sizes.s
@@ -3,7 +3,7 @@
 # misinterpreted that value as a reference to a DIE specifying the VLA size even
 # though the form was a data form (as it should be).
 
-# REQUIRES: lld, x86
+# REQUIRES: lld
 
 # RUN: llvm-mc -triple x86_64-pc-linux %s -filetype=obj > %t.o
 # RUN: ld.lld %t.o -o %t

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/childless-compile-unit.s b/lldb/test/Shell/SymbolFile/DWARF/x86/childless-compile-unit.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/childless-compile-unit.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/childless-compile-unit.s
index a47c378ffe3e..d167e0503c52 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/childless-compile-unit.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/childless-compile-unit.s
@@ -2,8 +2,6 @@
 # unit in this file sets DW_CHILDREN_no, but it still includes an
 # end-of-children marker in its contribution.
 
-# REQUIRES: x86
-
 # RUN: llvm-mc -triple x86_64-pc-linux %s -filetype=obj > %t.o
 # RUN: lldb-test symbols %t.o
 

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/compilercontext.ll b/lldb/test/Shell/SymbolFile/DWARF/x86/compilercontext.ll
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/compilercontext.ll
rename to lldb/test/Shell/SymbolFile/DWARF/x86/compilercontext.ll

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/debug-line-basic.s b/lldb/test/Shell/SymbolFile/DWARF/x86/debug-line-basic.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/debug-line-basic.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/debug-line-basic.s
index a1100ba8d9cf..f52ec2a899fc 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/debug-line-basic.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/debug-line-basic.s
@@ -3,7 +3,7 @@
 # condition when the final end-of-sequence line table entry points to an address
 # that is outside the range of memory covered by the module.
 
-# REQUIRES: lld, x86
+# REQUIRES: lld
 
 # RUN: llvm-mc -triple x86_64-pc-linux %s -filetype=obj > %t.o
 # RUN: ld.lld --script=%S/Inputs/debug-line-basic.script %t.o -o %t

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/debug-names-compressed.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/debug-names-compressed.cpp
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/debug-names-compressed.cpp
rename to lldb/test/Shell/SymbolFile/DWARF/x86/debug-names-compressed.cpp

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/debug-types-address-ranges.s b/lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-address-ranges.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/debug-types-address-ranges.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-address-ranges.s
index 6091cbb5b50e..2d5a9ae515d0 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/debug-types-address-ranges.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-address-ranges.s
@@ -4,7 +4,7 @@
 # compute address range for the type unit as type units don't describe any
 # addresses. The addresses should always resolve to the relevant compile units.
 
-# REQUIRES: lld, x86
+# REQUIRES: lld
 
 # RUN: llvm-mc -dwarf-version=5 -triple x86_64-pc-linux %s -filetype=obj >%t.o
 # RUN: ld.lld %t.o -o %t -image-base=0x47000 -z separate-code

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/debug-types-basic.test b/lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-basic.test
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/debug-types-basic.test
rename to lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-basic.test

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/debug-types-dwarf5.s b/lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-dwarf5.s
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/debug-types-dwarf5.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-dwarf5.s

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/debug-types-dwo-cross-reference.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-dwo-cross-reference.cpp
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/debug-types-dwo-cross-reference.cpp
rename to lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-dwo-cross-reference.cpp

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/debug-types-line-tables.s b/lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-line-tables.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/debug-types-line-tables.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-line-tables.s
index 803f93ff679f..a20697ea2670 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/debug-types-line-tables.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-line-tables.s
@@ -1,5 +1,3 @@
-# REQUIRES: x86
-
 # RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux %s -o %t
 # RUN: lldb-test symbols %t | FileCheck %s
 

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/debug-types-missing-signature.test b/lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-missing-signature.test
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/debug-types-missing-signature.test
rename to lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-missing-signature.test

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/debug-types-signature-loop.s b/lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-signature-loop.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/debug-types-signature-loop.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-signature-loop.s
index addab83ddcc7..d0d0fd5705a4 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/debug-types-signature-loop.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-signature-loop.s
@@ -1,4 +1,4 @@
-# REQUIRES: lld, x86
+# REQUIRES: lld
 
 # RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux -o %t.o %s
 # RUN: ld.lld %t.o -o %t

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/debug_aranges-empty-section.s b/lldb/test/Shell/SymbolFile/DWARF/x86/debug_aranges-empty-section.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/debug_aranges-empty-section.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/debug_aranges-empty-section.s
index 98aa562620fe..5e83f269650a 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/debug_aranges-empty-section.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/debug_aranges-empty-section.s
@@ -1,7 +1,5 @@
 # Test that an empty .debug_aranges section doesn't confuse (or crash) us.
 
-# REQUIRES: x86
-
 # RUN: llvm-mc %s -triple x86_64-pc-linux -filetype=obj >%t
 # RUN: %lldb %t -o "breakpoint set -n f" -b | FileCheck %s
 

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/debug_line-relative_path.s b/lldb/test/Shell/SymbolFile/DWARF/x86/debug_line-relative_path.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/debug_line-relative_path.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/debug_line-relative_path.s
index 8bbf30bfcc39..609984bf7e73 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/debug_line-relative_path.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/debug_line-relative_path.s
@@ -2,8 +2,6 @@
 # produced by "clang -fdebug-compilation-dir <something-relative>". This is one
 # of the techniques used to produce "relocatable" debug info.
 
-# REQUIRES: x86
-
 # RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux -o %t %s
 # RUN: %lldb %t -o "image dump line-table t.c" | FileCheck %s
 

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/debug_line-tombstone.s b/lldb/test/Shell/SymbolFile/DWARF/x86/debug_line-tombstone.s
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/debug_line-tombstone.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/debug_line-tombstone.s

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/debug_loc-aslr.s b/lldb/test/Shell/SymbolFile/DWARF/x86/debug_loc-aslr.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/debug_loc-aslr.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/debug_loc-aslr.s
index 621ffecba9ca..c9d0f9970340 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/debug_loc-aslr.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/debug_loc-aslr.s
@@ -2,8 +2,6 @@
 # not loaded at the address at which it was linked (as happens with ASLR for
 # instance).
 
-# REQUIRES: x86
-
 # RUN: yaml2obj %S/Inputs/debug_loc-aslr.yaml -o %t.dmp
 # RUN: llvm-mc --triple=x86_64-pc-linux --filetype=obj %s >%t.o
 # RUN: %lldb -c %t.dmp -o "image add %t.o" \

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/debug_loc.s b/lldb/test/Shell/SymbolFile/DWARF/x86/debug_loc.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/debug_loc.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/debug_loc.s
index c1ee8efdc9c4..3d78469f6306 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/debug_loc.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/debug_loc.s
@@ -2,7 +2,6 @@
 # behavior in the invalid cases is not particularly important, but it should be
 # "reasonable".
 
-# REQUIRES: x86
 # UNSUPPORTED: lldb-repro
 
 # RUN: llvm-mc -triple=x86_64-pc-linux -filetype=obj %s --defsym LOC=0 > %t

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/debug_loc_and_loclists.s b/lldb/test/Shell/SymbolFile/DWARF/x86/debug_loc_and_loclists.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/debug_loc_and_loclists.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/debug_loc_and_loclists.s
index 05bccbe78aab..72de2b0c6782 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/debug_loc_and_loclists.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/debug_loc_and_loclists.s
@@ -1,8 +1,6 @@
 # Test that we can handle DWARF 4 and 5 location lists in the same object file
 # (but 
diff erent compile units).
 
-# REQUIRES: x86
-
 # RUN: llvm-mc -triple=x86_64-pc-linux -filetype=obj %s > %t
 # RUN: %lldb %t -o "image lookup -v -s loc" -o "image lookup -v -s loclists" \
 # RUN:   -o exit | FileCheck %s

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/debug_loclists-dwo.s b/lldb/test/Shell/SymbolFile/DWARF/x86/debug_loclists-dwo.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/debug_loclists-dwo.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/debug_loclists-dwo.s
index b045d7de9abb..741db0b7df0f 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/debug_loclists-dwo.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/debug_loclists-dwo.s
@@ -1,5 +1,3 @@
-# REQUIRES: x86
-
 # RUN: cd %T
 # RUN: llvm-mc -triple=x86_64-pc-linux -filetype=obj %s >debug_loclists-dwo.o
 # RUN: %lldb debug_loclists-dwo.o -o "image lookup -v -s lookup_loclists" -o exit | FileCheck %s

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/debug_ranges-missing-section.s b/lldb/test/Shell/SymbolFile/DWARF/x86/debug_ranges-missing-section.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/debug_ranges-missing-section.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/debug_ranges-missing-section.s
index 39e989e26eb0..6fd9c10bee19 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/debug_ranges-missing-section.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/debug_ranges-missing-section.s
@@ -1,5 +1,3 @@
-# REQUIRES: x86
-
 # RUN: llvm-mc -triple=x86_64-pc-linux -filetype=obj %s > %t
 # RUN: %lldb %t -o "image lookup -v -s lookup_ranges" -o exit 2>&1 | FileCheck %s
 

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/debug_ranges.s b/lldb/test/Shell/SymbolFile/DWARF/x86/debug_ranges.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/debug_ranges.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/debug_ranges.s
index 2e410994eb02..ace0606d0170 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/debug_ranges.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/debug_ranges.s
@@ -1,5 +1,3 @@
-# REQUIRES: x86
-
 # RUN: llvm-mc -triple=x86_64-pc-linux -filetype=obj %s > %t
 # RUN: %lldb %t -o "image lookup -v -s lookup_ranges" -o exit | FileCheck %s
 

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/debug_ranges_and_rnglists.test b/lldb/test/Shell/SymbolFile/DWARF/x86/debug_ranges_and_rnglists.test
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/debug_ranges_and_rnglists.test
rename to lldb/test/Shell/SymbolFile/DWARF/x86/debug_ranges_and_rnglists.test

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/debug_rnglists-dwo.s b/lldb/test/Shell/SymbolFile/DWARF/x86/debug_rnglists-dwo.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/debug_rnglists-dwo.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/debug_rnglists-dwo.s
index f9f55cf2aa6b..edc83450495c 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/debug_rnglists-dwo.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/debug_rnglists-dwo.s
@@ -1,5 +1,3 @@
-# REQUIRES: x86
-
 # RUN: cd %T
 # RUN: llvm-mc -triple=x86_64-pc-linux -filetype=obj %s >debug_rnglists-dwo.o
 # RUN: %lldb debug_rnglists-dwo.o -o "image lookup -v -s lookup_rnglists" \

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/debug_rnglists.s b/lldb/test/Shell/SymbolFile/DWARF/x86/debug_rnglists.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/debug_rnglists.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/debug_rnglists.s
index 56be1c02daae..89b5d94c68c3 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/debug_rnglists.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/debug_rnglists.s
@@ -1,5 +1,3 @@
-# REQUIRES: x86
-
 # RUN: llvm-mc -triple=x86_64-pc-linux -filetype=obj %s > %t
 # RUN: %lldb %t -o "image lookup -v -s lookup_rnglists" \
 # RUN:   -o "image lookup -v -s lookup_rnglists2" -o exit | FileCheck %s

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/dir-separator-no-comp-dir-relative-name.s b/lldb/test/Shell/SymbolFile/DWARF/x86/dir-separator-no-comp-dir-relative-name.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/dir-separator-no-comp-dir-relative-name.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/dir-separator-no-comp-dir-relative-name.s
index 7fee15d65ca2..0841a0dd9c7a 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/dir-separator-no-comp-dir-relative-name.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/dir-separator-no-comp-dir-relative-name.s
@@ -2,7 +2,7 @@
 # does not have enough information for our heuristics to determine the path
 # style, so we will just treat them as native host paths.
 
-# REQUIRES: lld, x86
+# REQUIRES: lld
 
 # RUN: llvm-mc -triple x86_64-pc-linux %s -filetype=obj > %t.o
 # RUN: ld.lld %t.o -o %t -z separate-code

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/dir-separator-no-comp-dir.s b/lldb/test/Shell/SymbolFile/DWARF/x86/dir-separator-no-comp-dir.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/dir-separator-no-comp-dir.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/dir-separator-no-comp-dir.s
index de6bde9b5c62..a0870dc9f421 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/dir-separator-no-comp-dir.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/dir-separator-no-comp-dir.s
@@ -1,7 +1,7 @@
 # Test that we properly determine the path syntax of a compile unit even if the
 # compile unit does not have a DW_AT_comp_dir attribute.
 
-# REQUIRES: lld, x86
+# REQUIRES: lld
 
 # RUN: llvm-mc -triple x86_64-pc-linux %s -filetype=obj > %t.o
 # RUN: ld.lld %t.o -o %t -z separate-code

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/dir-separator-posix.s b/lldb/test/Shell/SymbolFile/DWARF/x86/dir-separator-posix.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/dir-separator-posix.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/dir-separator-posix.s
index d64667089192..2c2018167ccb 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/dir-separator-posix.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/dir-separator-posix.s
@@ -1,7 +1,7 @@
 # Test that parsing of line tables works reasonably, even if the host directory
 # separator does not match the separator of the compile unit.
 
-# REQUIRES: lld, x86
+# REQUIRES: lld
 
 # RUN: llvm-mc -triple x86_64-pc-linux %s -filetype=obj > %t.o
 # RUN: ld.lld %t.o -o %t -z separate-code

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/dir-separator-windows.s b/lldb/test/Shell/SymbolFile/DWARF/x86/dir-separator-windows.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/dir-separator-windows.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/dir-separator-windows.s
index d64033546f7f..c0154a674b81 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/dir-separator-windows.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/dir-separator-windows.s
@@ -1,7 +1,7 @@
 # Test that parsing of line tables works reasonably, even if the host directory
 # separator does not match the separator of the compile unit.
 
-# REQUIRES: lld, x86
+# REQUIRES: lld
 
 # RUN: llvm-mc -triple x86_64-pc-linux %s -filetype=obj > %t.o
 # RUN: ld.lld %t.o -o %t -z separate-code

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/dwarf5-atomic.s b/lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-atomic.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/dwarf5-atomic.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-atomic.s
index 79573a01fd49..793204a66b74 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/dwarf5-atomic.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-atomic.s
@@ -1,5 +1,3 @@
-# REQUIRES: x86
-
 # RUN: llvm-mc -triple=x86_64-pc-linux -filetype=obj %s > %t
 # RUN: %lldb %t -o "target variable integer structure" -o exit | FileCheck %s
 

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/dwarf5-debug_line-file-index.s b/lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-debug_line-file-index.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/dwarf5-debug_line-file-index.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-debug_line-file-index.s
index 54d07df10431..a9118356f9a2 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/dwarf5-debug_line-file-index.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-debug_line-file-index.s
@@ -1,5 +1,4 @@
 # Test handling of DWARF5 file index 0.
-# REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -o %t -triple x86_64-pc-linux %s
 # RUN: %lldb %t -o "image lookup -f hello.c -l 1" \

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/dwarf5-debug_line.s b/lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-debug_line.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/dwarf5-debug_line.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-debug_line.s
index d15f31039bbd..8fe49b795d0f 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/dwarf5-debug_line.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-debug_line.s
@@ -1,8 +1,6 @@
 # Test handling of DWARF5 line tables. In particular, test that we handle files
 # which are present in the line table more than once.
 
-# REQUIRES: x86
-
 # RUN: llvm-mc -filetype=obj -o %t -triple x86_64-pc-linux %s
 # RUN: %lldb %t -o "source info -f file0.c" -o "source info -f file1.c" \
 # RUN:   -o "breakpoint set -f file0.c -l 42" \

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/dwarf5-implicit-const.s b/lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-implicit-const.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/dwarf5-implicit-const.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-implicit-const.s
index b6c717818bd6..855051f8bce9 100755
--- a/lldb/test/Shell/SymbolFile/DWARF/dwarf5-implicit-const.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-implicit-const.s
@@ -1,7 +1,5 @@
 # Test handling of DWARF5 DW_FORM_implicit_const as used by GCC.
 
-# REQUIRES: x86
-
 # RUN: llvm-mc -filetype=obj -o %t -triple x86_64-pc-linux %s
 # RUN: %lldb %t -o "expression -T -- variable_implicit_const" \
 # RUN:   -o exit | FileCheck %s

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/dwarf5-index-is-used.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-index-is-used.cpp
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/dwarf5-index-is-used.cpp
rename to lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-index-is-used.cpp

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/dwarf5-line-strp.s b/lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-line-strp.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/dwarf5-line-strp.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-line-strp.s
index abb4d2bd0520..5c08f4a40528 100755
--- a/lldb/test/Shell/SymbolFile/DWARF/dwarf5-line-strp.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-line-strp.s
@@ -1,7 +1,6 @@
 # Test handling of DWARF5 DW_FORM_line_strp from .debug_info as used by GCC.
 
 # UNSUPPORTED: system-darwin, system-windows
-# REQUIRES: x86
 
 # RUN: llvm-mc -filetype=obj -o %t -triple x86_64-pc-linux %s
 # RUN: %lldb %t -o "p main" \

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/dwarf5-partial-index.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-partial-index.cpp
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/dwarf5-partial-index.cpp
rename to lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-partial-index.cpp

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/dwarf5-split.s b/lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-split.s
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/dwarf5-split.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-split.s

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/dwarf5_locations.s b/lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5_locations.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/dwarf5_locations.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5_locations.s
index edda075c20f1..318a6c7e9e16 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/dwarf5_locations.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5_locations.s
@@ -1,6 +1,6 @@
 # This tests that lldb is able to process DW_OP_addrx tags introduced in dwarf5.
 
-# REQUIRES: lld, x86
+# REQUIRES: lld
 
 # RUN: llvm-mc -g -dwarf-version=5 -triple x86_64-unknown-linux-gnu %s -filetype=obj > %t.o
 # RUN: ld.lld -m elf_x86_64 %t.o -o %t 

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/dwarf5_tu_index_abbrev_offset.s b/lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5_tu_index_abbrev_offset.s
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/dwarf5_tu_index_abbrev_offset.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5_tu_index_abbrev_offset.s

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/dwo-type-in-main-file.s b/lldb/test/Shell/SymbolFile/DWARF/x86/dwo-type-in-main-file.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/dwo-type-in-main-file.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/dwo-type-in-main-file.s
index 3b6d52c9042a..6c639128a5ec 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/dwo-type-in-main-file.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/dwo-type-in-main-file.s
@@ -2,8 +2,6 @@
 # type, but that type is defined in another compile unit in the main object
 # file.
 
-# REQUIRES: x86
-
 # RUN: llvm-mc %s -o %t --triple=x86_64-pc-linux --filetype=obj --defsym MAIN=0
 # RUN: llvm-mc %s -o %T/dwo-type-in-main-file-cu2.dwo --triple=x86_64-pc-linux --filetype=obj --defsym DWO=0
 # RUN: cd %T

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/dwp-debug-types.s b/lldb/test/Shell/SymbolFile/DWARF/x86/dwp-debug-types.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/dwp-debug-types.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/dwp-debug-types.s
index a046ca6b1496..237a0acf41b6 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/dwp-debug-types.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/dwp-debug-types.s
@@ -1,5 +1,3 @@
-# REQUIRES: x86
-
 # RUN: llvm-mc --filetype=obj --triple x86_64-pc-linux %s -o %t --defsym MAIN=0
 # RUN: llvm-mc --filetype=obj --triple x86_64-pc-linux %s -o %t.dwp --defsym DWP=0
 # RUN: %lldb %t -o "type lookup ENUM0" -o "target variable A" -b | FileCheck %s

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/dwp-separate-debug-file.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/dwp-separate-debug-file.cpp
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/dwp-separate-debug-file.cpp
rename to lldb/test/Shell/SymbolFile/DWARF/x86/dwp-separate-debug-file.cpp

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/dwp.s b/lldb/test/Shell/SymbolFile/DWARF/x86/dwp.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/dwp.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/dwp.s
index 7987299197d9..3ae9673684d5 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/dwp.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/dwp.s
@@ -1,5 +1,3 @@
-# REQUIRES: x86
-
 # RUN: llvm-mc --filetype=obj --triple x86_64-pc-linux %s -o %t --defsym MAIN=0
 # RUN: llvm-mc --filetype=obj --triple x86_64-pc-linux %s -o %t.dwp --defsym DWP=0
 # RUN: %lldb %t -o "target variable A" -o "image lookup -v -n F1" -b | FileCheck %s

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/find-basic-function.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/find-basic-function.cpp
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/find-basic-function.cpp
rename to lldb/test/Shell/SymbolFile/DWARF/x86/find-basic-function.cpp

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/find-basic-namespace.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/find-basic-namespace.cpp
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/find-basic-namespace.cpp
rename to lldb/test/Shell/SymbolFile/DWARF/x86/find-basic-namespace.cpp

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/find-basic-type.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/find-basic-type.cpp
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/find-basic-type.cpp
rename to lldb/test/Shell/SymbolFile/DWARF/x86/find-basic-type.cpp

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/find-basic-variable.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/find-basic-variable.cpp
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/find-basic-variable.cpp
rename to lldb/test/Shell/SymbolFile/DWARF/x86/find-basic-variable.cpp

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/find-function-regex.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/find-function-regex.cpp
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/find-function-regex.cpp
rename to lldb/test/Shell/SymbolFile/DWARF/x86/find-function-regex.cpp

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/find-inline-method.s b/lldb/test/Shell/SymbolFile/DWARF/x86/find-inline-method.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/find-inline-method.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/find-inline-method.s
index cfc5ef01dd35..b94b78723c10 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/find-inline-method.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/find-inline-method.s
@@ -1,4 +1,4 @@
-# REQUIRES: lld, x86
+# REQUIRES: lld
 
 # RUN: llvm-mc -triple x86_64-pc-linux %s -filetype=obj > %t.o
 # RUN: ld.lld %t.o -o %t -z separate-code

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/find-method-local-struct.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/find-method-local-struct.cpp
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/find-method-local-struct.cpp
rename to lldb/test/Shell/SymbolFile/DWARF/x86/find-method-local-struct.cpp

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/find-method.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/find-method.cpp
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/find-method.cpp
rename to lldb/test/Shell/SymbolFile/DWARF/x86/find-method.cpp

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/find-qualified-variable.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/find-qualified-variable.cpp
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/find-qualified-variable.cpp
rename to lldb/test/Shell/SymbolFile/DWARF/x86/find-qualified-variable.cpp

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/find-variable-dwo.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/find-variable-dwo.cpp
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/find-variable-dwo.cpp
rename to lldb/test/Shell/SymbolFile/DWARF/x86/find-variable-dwo.cpp

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/find-variable-file.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/find-variable-file.cpp
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/find-variable-file.cpp
rename to lldb/test/Shell/SymbolFile/DWARF/x86/find-variable-file.cpp

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/gnu-style-compression.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/gnu-style-compression.cpp
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/gnu-style-compression.cpp
rename to lldb/test/Shell/SymbolFile/DWARF/x86/gnu-style-compression.cpp

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/inline-function-address-shared.test b/lldb/test/Shell/SymbolFile/DWARF/x86/inline-function-address-shared.test
similarity index 93%
rename from lldb/test/Shell/SymbolFile/DWARF/inline-function-address-shared.test
rename to lldb/test/Shell/SymbolFile/DWARF/x86/inline-function-address-shared.test
index 5aa7759c5ed7..8334340abf50 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/inline-function-address-shared.test
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/inline-function-address-shared.test
@@ -1,4 +1,4 @@
-# REQUIRES: lld, x86
+# REQUIRES: lld
 ; RUN: llc -mtriple x86_64-pc-linux %S/inline-function-address.ll -filetype=obj -o %t.o
 ; RUN: ld.lld %t.o %t.o -o %t -shared
 ; RUN: lldb-test symbols --find=function --name=foo --function-flags=full %t | FileCheck %s

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/inline-function-address.ll b/lldb/test/Shell/SymbolFile/DWARF/x86/inline-function-address.ll
similarity index 98%
rename from lldb/test/Shell/SymbolFile/DWARF/inline-function-address.ll
rename to lldb/test/Shell/SymbolFile/DWARF/x86/inline-function-address.ll
index fde90d269a1d..737beaec0dbc 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/inline-function-address.ll
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/inline-function-address.ll
@@ -1,4 +1,4 @@
-; REQUIRES: lld, x86
+; REQUIRES: lld
 ; RUN: llc -mtriple x86_64-pc-linux %s -filetype=obj -o %t.o
 ; RUN: ld.lld %t.o %t.o -o %t
 ; "foo" is defined in both compilation units, but there should be only one meaningful debuginfo entry

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/limit-debug-info.s b/lldb/test/Shell/SymbolFile/DWARF/x86/limit-debug-info.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/limit-debug-info.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/limit-debug-info.s
index b14d6106cf06..6a2140a14792 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/limit-debug-info.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/limit-debug-info.s
@@ -1,4 +1,4 @@
-# REQUIRES: lld, x86
+# REQUIRES: lld
 # RUN: llvm-mc --triple=x86_64-pc-windows --filetype=obj --defsym DLL=0 %s >%t.dll.o
 # RUN: llvm-mc --triple=x86_64-pc-windows --filetype=obj --defsym EXE=0 %s >%t.exe.o
 # RUN: lld-link /OUT:%t.dll %t.dll.o /SUBSYSTEM:console /dll /noentry /debug

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/x86/lit.local.cfg b/lldb/test/Shell/SymbolFile/DWARF/x86/lit.local.cfg
new file mode 100644
index 000000000000..41e9d977db6d
--- /dev/null
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/lit.local.cfg
@@ -0,0 +1,2 @@
+if not 'x86' in config.available_features:
+  config.unsupported = True

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/module-ownership.mm b/lldb/test/Shell/SymbolFile/DWARF/x86/module-ownership.mm
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/module-ownership.mm
rename to lldb/test/Shell/SymbolFile/DWARF/x86/module-ownership.mm

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/parallel-indexing-stress.s b/lldb/test/Shell/SymbolFile/DWARF/x86/parallel-indexing-stress.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/parallel-indexing-stress.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/parallel-indexing-stress.s
index 94b35e5c1141..46e4c5565fd1 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/parallel-indexing-stress.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/parallel-indexing-stress.s
@@ -1,7 +1,5 @@
 # Stress-test the parallel indexing of compile units.
 
-# REQUIRES: x86
-
 # RUN: llvm-mc -triple x86_64-pc-linux %s -o %t -filetype=obj
 # RUN: %lldb %t -o "target variable A" -b | FileCheck %s
 

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/split-dwarf-inlining.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/split-dwarf-inlining.cpp
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/split-dwarf-inlining.cpp
rename to lldb/test/Shell/SymbolFile/DWARF/x86/split-dwarf-inlining.cpp

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/split-dwarf-multiple-cu.ll b/lldb/test/Shell/SymbolFile/DWARF/x86/split-dwarf-multiple-cu.ll
similarity index 100%
rename from lldb/test/Shell/SymbolFile/DWARF/split-dwarf-multiple-cu.ll
rename to lldb/test/Shell/SymbolFile/DWARF/x86/split-dwarf-multiple-cu.ll

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/static_scope.s b/lldb/test/Shell/SymbolFile/DWARF/x86/static_scope.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/static_scope.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/static_scope.s
index 02d497ac9ccb..96cbf131e330 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/static_scope.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/static_scope.s
@@ -1,8 +1,6 @@
 # Test that the DWARF parser assigns the right scope to the
 # variable `b`, which is `local` and not `static`.
 
-# REQUIRES: x86
-
 # Original test case (for future reference), compiled with:
 # $ clang-10 -g -Og test.c -o test
 # $ cat test.c

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/subprogram_ranges.test b/lldb/test/Shell/SymbolFile/DWARF/x86/subprogram_ranges.test
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/subprogram_ranges.test
rename to lldb/test/Shell/SymbolFile/DWARF/x86/subprogram_ranges.test
index 858dfd7a51d6..e8e49bd52be0 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/subprogram_ranges.test
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/subprogram_ranges.test
@@ -1,4 +1,3 @@
-# REQUIRES: x86
 # REQUIRES: lld
 # RUN: %clang -target x86_64-pc-linux -g -O0 %S/Inputs/subprogram_ranges.s -o %t.o -c
 # RUN: ld.lld %t.o -o %t

diff  --git a/lldb/test/Shell/SymbolFile/DWARF/win-i386-line-table.s b/lldb/test/Shell/SymbolFile/DWARF/x86/win-i386-line-table.s
similarity index 99%
rename from lldb/test/Shell/SymbolFile/DWARF/win-i386-line-table.s
rename to lldb/test/Shell/SymbolFile/DWARF/x86/win-i386-line-table.s
index 2fa5ba5352b6..d24b8ee68980 100644
--- a/lldb/test/Shell/SymbolFile/DWARF/win-i386-line-table.s
+++ b/lldb/test/Shell/SymbolFile/DWARF/x86/win-i386-line-table.s
@@ -1,7 +1,7 @@
 # Test that lldb can read a line table for an architecture with a 
diff erent
 # address size than the one that of the host.
 
-# REQUIRES: lld, x86
+# REQUIRES: lld
 
 # RUN: llvm-mc -triple i686-windows-gnu %s -filetype=obj > %t.o
 # RUN: lld-link %t.o -out:%t.exe -debug:dwarf -entry:entry -subsystem:console -lldmingw

More information about the lldb-commits mailing list