From 286c48af238c2d3a24ebc5a06ea5191f333eaed0 Mon Sep 17 00:00:00 2001
From: Mark Searles <mark.searles@amd.com>
Date: Tue, 6 Jul 2021 05:54:52 -0700
Subject: [PATCH] Revert "Turn on the new pass manager by default"

This reverts commit 669ddd1e9b1226432b003dbba05b99f8e992285b.

Un-XFAIL one test

Change-Id: Ieebd1fa4a1457970fb174b897c8223557f675b51
---
 llvm/CMakeLists.txt                                          | 4 ++--
 llvm/test/Transforms/LoopUnswitch/AMDGPU/uniform-unswitch.ll | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
index f5298de9f7ca65..1affc289e64b3c 100644
--- a/llvm/CMakeLists.txt
+++ b/llvm/CMakeLists.txt
@@ -688,8 +688,8 @@ else()
 endif()
 option(LLVM_ENABLE_PLUGINS "Enable plugin support" ${LLVM_ENABLE_PLUGINS_default})
 
-set(ENABLE_EXPERIMENTAL_NEW_PASS_MANAGER TRUE CACHE BOOL
-  "Enable the new pass manager by default.")
+set(ENABLE_EXPERIMENTAL_NEW_PASS_MANAGER FALSE CACHE BOOL
+  "Enable the experimental new pass manager by default.")
 
 include(HandleLLVMOptions)
 
diff --git a/llvm/test/Transforms/LoopUnswitch/AMDGPU/uniform-unswitch.ll b/llvm/test/Transforms/LoopUnswitch/AMDGPU/uniform-unswitch.ll
index 943a5338bacb74..ae8ed7b40e0b5c 100644
--- a/llvm/test/Transforms/LoopUnswitch/AMDGPU/uniform-unswitch.ll
+++ b/llvm/test/Transforms/LoopUnswitch/AMDGPU/uniform-unswitch.ll
@@ -1,5 +1,4 @@
 ; RUN: opt -mtriple=amdgcn-- -O3 -S %s | FileCheck %s
-; XFAIL: *
 
 ; Check that loop unswitch happened and condition hoisted out of the loop.
 ; Condition is uniform so even targets with divergence should perform unswitching.