diff --git a/llvm/test/Transforms/SimplifyCFG/2010-03-30-InvokeCrash.ll b/llvm/test/Transforms/SimplifyCFG/X86/2010-03-30-InvokeCrash.ll
similarity index 100%
rename from llvm/test/Transforms/SimplifyCFG/2010-03-30-InvokeCrash.ll
rename to llvm/test/Transforms/SimplifyCFG/X86/2010-03-30-InvokeCrash.ll
diff --git a/llvm/test/Transforms/SimplifyCFG/CoveredLookupTable.ll b/llvm/test/Transforms/SimplifyCFG/X86/CoveredLookupTable.ll
similarity index 100%
rename from llvm/test/Transforms/SimplifyCFG/CoveredLookupTable.ll
rename to llvm/test/Transforms/SimplifyCFG/X86/CoveredLookupTable.ll
diff --git a/llvm/test/Transforms/SimplifyCFG/MagicPointer.ll b/llvm/test/Transforms/SimplifyCFG/X86/MagicPointer.ll
similarity index 100%
rename from llvm/test/Transforms/SimplifyCFG/MagicPointer.ll
rename to llvm/test/Transforms/SimplifyCFG/X86/MagicPointer.ll
diff --git a/llvm/test/Transforms/SimplifyCFG/PR29163.ll b/llvm/test/Transforms/SimplifyCFG/X86/PR29163.ll
similarity index 100%
rename from llvm/test/Transforms/SimplifyCFG/PR29163.ll
rename to llvm/test/Transforms/SimplifyCFG/X86/PR29163.ll
diff --git a/llvm/test/Transforms/SimplifyCFG/PR30210.ll b/llvm/test/Transforms/SimplifyCFG/X86/PR30210.ll
similarity index 100%
rename from llvm/test/Transforms/SimplifyCFG/PR30210.ll
rename to llvm/test/Transforms/SimplifyCFG/X86/PR30210.ll
diff --git a/llvm/test/Transforms/SimplifyCFG/SpeculativeExec.ll b/llvm/test/Transforms/SimplifyCFG/X86/SpeculativeExec.ll
similarity index 100%
rename from llvm/test/Transforms/SimplifyCFG/SpeculativeExec.ll
rename to llvm/test/Transforms/SimplifyCFG/X86/SpeculativeExec.ll
diff --git a/llvm/test/Transforms/SimplifyCFG/bug-25299.ll b/llvm/test/Transforms/SimplifyCFG/X86/bug-25299.ll
similarity index 100%
rename from llvm/test/Transforms/SimplifyCFG/bug-25299.ll
rename to llvm/test/Transforms/SimplifyCFG/X86/bug-25299.ll
diff --git a/llvm/test/Transforms/SimplifyCFG/combine-parallel-mem-md.ll b/llvm/test/Transforms/SimplifyCFG/X86/combine-parallel-mem-md.ll
similarity index 100%
rename from llvm/test/Transforms/SimplifyCFG/combine-parallel-mem-md.ll
rename to llvm/test/Transforms/SimplifyCFG/X86/combine-parallel-mem-md.ll
diff --git a/llvm/test/Transforms/SimplifyCFG/critedge-assume.ll b/llvm/test/Transforms/SimplifyCFG/X86/critedge-assume.ll
similarity index 100%
rename from llvm/test/Transforms/SimplifyCFG/critedge-assume.ll
rename to llvm/test/Transforms/SimplifyCFG/X86/critedge-assume.ll
diff --git a/llvm/test/Transforms/SimplifyCFG/empty-cleanuppad.ll b/llvm/test/Transforms/SimplifyCFG/X86/empty-cleanuppad.ll
similarity index 100%
rename from llvm/test/Transforms/SimplifyCFG/empty-cleanuppad.ll
rename to llvm/test/Transforms/SimplifyCFG/X86/empty-cleanuppad.ll
diff --git a/llvm/test/Transforms/SimplifyCFG/fold-branch-debuginvariant.ll b/llvm/test/Transforms/SimplifyCFG/X86/fold-branch-debuginvariant.ll
similarity index 100%
rename from llvm/test/Transforms/SimplifyCFG/fold-branch-debuginvariant.ll
rename to llvm/test/Transforms/SimplifyCFG/X86/fold-branch-debuginvariant.ll
diff --git a/llvm/test/Transforms/SimplifyCFG/invalidate-dom.ll b/llvm/test/Transforms/SimplifyCFG/X86/invalidate-dom.ll
similarity index 100%
rename from llvm/test/Transforms/SimplifyCFG/invalidate-dom.ll
rename to llvm/test/Transforms/SimplifyCFG/X86/invalidate-dom.ll
diff --git a/llvm/test/Transforms/SimplifyCFG/merge-cleanuppads.ll b/llvm/test/Transforms/SimplifyCFG/X86/merge-cleanuppads.ll
similarity index 100%
rename from llvm/test/Transforms/SimplifyCFG/merge-cleanuppads.ll
rename to llvm/test/Transforms/SimplifyCFG/X86/merge-cleanuppads.ll
diff --git a/llvm/test/Transforms/SimplifyCFG/remove-debug-2.ll b/llvm/test/Transforms/SimplifyCFG/X86/remove-debug-2.ll
similarity index 100%
rename from llvm/test/Transforms/SimplifyCFG/remove-debug-2.ll
rename to llvm/test/Transforms/SimplifyCFG/X86/remove-debug-2.ll
diff --git a/llvm/test/Transforms/SimplifyCFG/remove-debug.ll b/llvm/test/Transforms/SimplifyCFG/X86/remove-debug.ll
similarity index 100%
rename from llvm/test/Transforms/SimplifyCFG/remove-debug.ll
rename to llvm/test/Transforms/SimplifyCFG/X86/remove-debug.ll
diff --git a/llvm/test/Transforms/SimplifyCFG/safe-low-bit-extract.ll b/llvm/test/Transforms/SimplifyCFG/X86/safe-low-bit-extract.ll
similarity index 100%
rename from llvm/test/Transforms/SimplifyCFG/safe-low-bit-extract.ll
rename to llvm/test/Transforms/SimplifyCFG/X86/safe-low-bit-extract.ll
diff --git a/llvm/test/Transforms/SimplifyCFG/unreachable-blocks.ll b/llvm/test/Transforms/SimplifyCFG/X86/unreachable-blocks.ll
similarity index 100%
rename from llvm/test/Transforms/SimplifyCFG/unreachable-blocks.ll
rename to llvm/test/Transforms/SimplifyCFG/X86/unreachable-blocks.ll